From 0c16fe70e4ae245128e3907f592a450a8b018911 Mon Sep 17 00:00:00 2001
From: "ingenarel (NeoJesus)" <ingenarel_neojesus@disroot.org>
Date: Sun, 23 Aug 2026 19:03:23 +0600
Subject: [PATCH] media-sound/goxlr-utility: change rust project's hardcoded
 target/release path [2/4]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See previous commit for more info

Besides fixing the path, it also fixes the inconsistent indentation,
there were double tabs on most instead of single tabs, and also
whitespaces after tabs in one area

Now it should have proper indentation

Bug: https://bugs.gentoo.org/975275
Signed-off-by: ingenarel (NeoJesus) <ingenarel_neojesus@disroot.org>
Part-of: https://codeberg.org/gentoo/guru/pulls/21
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 .../goxlr-utility/goxlr-utility-1.2.3.ebuild  | 31 +++++++---------
 .../goxlr-utility/goxlr-utility-9999.ebuild   | 37 +++++++++----------
 2 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/media-sound/goxlr-utility/goxlr-utility-1.2.3.ebuild b/media-sound/goxlr-utility/goxlr-utility-1.2.3.ebuild
index 38afa84038..4c2f109162 100644
--- a/media-sound/goxlr-utility/goxlr-utility-1.2.3.ebuild
+++ b/media-sound/goxlr-utility/goxlr-utility-1.2.3.ebuild
@@ -665,8 +665,8 @@ HOMEPAGE="https://github.com/GoXLR-on-Linux/goxlr-utility"
 inherit cargo udev shell-completion desktop xdg
 
 if [[ ${PV} == *9999* ]]; then
-		EGIT_REPO_URI="https://github.com/GoXLR-on-Linux/${PN}.git"
-		inherit git-r3
+	EGIT_REPO_URI="https://github.com/GoXLR-on-Linux/${PN}.git"
+	inherit git-r3
 else
 	SRC_URI="
 		https://github.com/GoXLR-on-Linux/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
@@ -711,25 +711,22 @@ src_configure() {
 }
 
 src_install() {
-		dobin "${WORKDIR}"/${P}/target/release/goxlr-daemon
-		dobin "${WORKDIR}"/${P}/target/release/goxlr-client
-		dobin "${WORKDIR}"/${P}/target/release/goxlr-defaults
-		dobin "${WORKDIR}"/${P}/target/release/goxlr-launcher
+	dobin "$(cargo_target_dir)/"goxlr-{daemon,client,defaults,launcher}
 
-		udev_dorules 50-goxlr.rules
+	udev_dorules 50-goxlr.rules
 
-		doicon -s 48 "${WORKDIR}"/${P}/daemon/resources/goxlr-utility.png
-		doicon -s scalable "${WORKDIR}"/${P}/daemon/resources/goxlr-utility.svg
-		newicon "${WORKDIR}"/${P}/daemon/resources/goxlr-utility-large.png goxlr-utility.png
-		domenu "${WORKDIR}"/${P}/daemon/resources/goxlr-utility.desktop
+	doicon -s 48 "${WORKDIR}"/${P}/daemon/resources/goxlr-utility.png
+	doicon -s scalable "${WORKDIR}"/${P}/daemon/resources/goxlr-utility.svg
+	newicon "${WORKDIR}"/${P}/daemon/resources/goxlr-utility-large.png goxlr-utility.png
+	domenu "${WORKDIR}"/${P}/daemon/resources/goxlr-utility.desktop
 
-		# Grab the Path where the AutoComplete scripts are..
-		AUTOCOMPLETE=$("${WORKDIR}"/${P}/ci/cargo-out-dir target/release/ client-stamp)
-		dobashcomp $AUTOCOMPLETE/goxlr-client.bash
-		dofishcomp $AUTOCOMPLETE/goxlr-client.fish
-		dozshcomp $AUTOCOMPLETE/_goxlr-client
+	# Grab the Path where the AutoComplete scripts are..
+	AUTOCOMPLETE="$("${WORKDIR}/${P}/ci/cargo-out-dir" "$(cargo_target_dir)/" client-stamp)"
+	dobashcomp "${AUTOCOMPLETE}/goxlr-client.bash"
+	dofishcomp "${AUTOCOMPLETE}/goxlr-client.fish"
+	dozshcomp "${AUTOCOMPLETE}/_goxlr-client"
 
-		dodoc README.md
+	dodoc README.md
 }
 
 pkg_postinst() {
diff --git a/media-sound/goxlr-utility/goxlr-utility-9999.ebuild b/media-sound/goxlr-utility/goxlr-utility-9999.ebuild
index c705c15faa..8cb4f412d5 100644
--- a/media-sound/goxlr-utility/goxlr-utility-9999.ebuild
+++ b/media-sound/goxlr-utility/goxlr-utility-9999.ebuild
@@ -9,8 +9,8 @@ HOMEPAGE="https://github.com/GoXLR-on-Linux/goxlr-utility"
 inherit cargo udev shell-completion desktop xdg
 
 if [[ ${PV} == *9999* ]]; then
-		EGIT_REPO_URI="https://github.com/GoXLR-on-Linux/${PN}.git"
-		inherit git-r3
+	EGIT_REPO_URI="https://github.com/GoXLR-on-Linux/${PN}.git"
+	inherit git-r3
 else
 	SRC_URI="
 		https://github.com/GoXLR-on-Linux/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
@@ -21,9 +21,9 @@ fi
 
 LICENSE="MIT Music-Tribe"
 LICENSE+="
-	    0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD CC0-1.0
-	    CDLA-Permissive-2.0 ISC MIT MPL-2.0 UoI-NCSA Unicode-3.0 Unlicense
-	    ZLIB
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD CC0-1.0
+	CDLA-Permissive-2.0 ISC MIT MPL-2.0 UoI-NCSA Unicode-3.0 Unlicense
+	ZLIB
 "
 SLOT="0"
 IUSE="tts"
@@ -55,25 +55,22 @@ src_configure() {
 }
 
 src_install() {
-		dobin "${WORKDIR}"/${P}/target/release/goxlr-daemon
-		dobin "${WORKDIR}"/${P}/target/release/goxlr-client
-		dobin "${WORKDIR}"/${P}/target/release/goxlr-defaults
-		dobin "${WORKDIR}"/${P}/target/release/goxlr-launcher
+	dobin "$(cargo_target_dir)/"goxlr-{daemon,client,defaults,launcher}
 
-		udev_dorules 50-goxlr.rules
+	udev_dorules 50-goxlr.rules
 
-		doicon -s 48 "${WORKDIR}"/${P}/daemon/resources/goxlr-utility.png
-		doicon -s scalable "${WORKDIR}"/${P}/daemon/resources/goxlr-utility.svg
-		newicon "${WORKDIR}"/${P}/daemon/resources/goxlr-utility-large.png goxlr-utility.png
-		domenu "${WORKDIR}"/${P}/daemon/resources/goxlr-utility.desktop
+	doicon -s 48 "${WORKDIR}"/${P}/daemon/resources/goxlr-utility.png
+	doicon -s scalable "${WORKDIR}"/${P}/daemon/resources/goxlr-utility.svg
+	newicon "${WORKDIR}"/${P}/daemon/resources/goxlr-utility-large.png goxlr-utility.png
+	domenu "${WORKDIR}"/${P}/daemon/resources/goxlr-utility.desktop
 
-		# Grab the Path where the AutoComplete scripts are..
-		AUTOCOMPLETE=$("${WORKDIR}"/${P}/ci/cargo-out-dir target/release/ client-stamp)
-		dobashcomp $AUTOCOMPLETE/goxlr-client.bash
-		dofishcomp $AUTOCOMPLETE/goxlr-client.fish
-		dozshcomp $AUTOCOMPLETE/_goxlr-client
+	# Grab the Path where the AutoComplete scripts are..
+	AUTOCOMPLETE="$("${WORKDIR}/${P}/ci/cargo-out-dir" "$(cargo_target_dir)/" client-stamp)"
+	dobashcomp "${AUTOCOMPLETE}/goxlr-client.bash"
+	dofishcomp "${AUTOCOMPLETE}/goxlr-client.fish"
+	dozshcomp "${AUTOCOMPLETE}/_goxlr-client"
 
-		dodoc README.md
+	dodoc README.md
 }
 
 pkg_postinst() {