diff --git a/app-benchmarks/hyperfine/hyperfine-1.16.1.ebuild b/app-benchmarks/hyperfine/hyperfine-1.16.1.ebuild index b91b6cea4b6eb..2dd876dd97143 100644 --- a/app-benchmarks/hyperfine/hyperfine-1.16.1.ebuild +++ b/app-benchmarks/hyperfine/hyperfine-1.16.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -159,7 +159,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv" QA_FLAGS_IGNORED="usr/bin/${PN}" src_install() { - local build_dir="$(dirname $(find target/ -name ${PN}.bash -print -quit))" + local build_dir="$(dirname $(find "$(cargo_target_dir)" -name ${PN}.bash -print -quit))" newbashcomp "${build_dir}/${PN}.bash" "${PN}" diff --git a/app-benchmarks/hyperfine/hyperfine-1.18.0.ebuild b/app-benchmarks/hyperfine/hyperfine-1.18.0.ebuild index b13a16e823031..959f004a26440 100644 --- a/app-benchmarks/hyperfine/hyperfine-1.18.0.ebuild +++ b/app-benchmarks/hyperfine/hyperfine-1.18.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -190,7 +190,7 @@ src_prepare() { } src_install() { - local build_dir="$(dirname $(find target/ -name ${PN}.bash -print -quit))" + local build_dir="$(dirname $(find "$(cargo_target_dir)" -name ${PN}.bash -print -quit))" newbashcomp "${build_dir}/${PN}.bash" "${PN}" diff --git a/app-containers/aardvark-dns/aardvark-dns-1.10.0.ebuild b/app-containers/aardvark-dns/aardvark-dns-1.10.0.ebuild index e4edd4d987c7f..3f6fb3a7a9f2e 100644 --- a/app-containers/aardvark-dns/aardvark-dns-1.10.0.ebuild +++ b/app-containers/aardvark-dns/aardvark-dns-1.10.0.ebuild @@ -38,7 +38,7 @@ src_unpack() { src_prepare() { default - sed -i -e "s|m0755 bin|m0755 target/$(usex debug debug release)|g;" Makefile || die + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die } src_install() { diff --git a/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild b/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild index cdf0cb032c103..1e5d082427fea 100644 --- a/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild +++ b/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild @@ -38,7 +38,7 @@ src_unpack() { src_prepare() { default - sed -i -e "s|m0755 bin|m0755 target/$(usex debug debug release)|g;" Makefile || die + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die } src_install() { diff --git a/app-containers/aardvark-dns/aardvark-dns-1.9.0.ebuild b/app-containers/aardvark-dns/aardvark-dns-1.9.0.ebuild index e4edd4d987c7f..3f6fb3a7a9f2e 100644 --- a/app-containers/aardvark-dns/aardvark-dns-1.9.0.ebuild +++ b/app-containers/aardvark-dns/aardvark-dns-1.9.0.ebuild @@ -38,7 +38,7 @@ src_unpack() { src_prepare() { default - sed -i -e "s|m0755 bin|m0755 target/$(usex debug debug release)|g;" Makefile || die + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die } src_install() { diff --git a/app-containers/aardvark-dns/aardvark-dns-9999.ebuild b/app-containers/aardvark-dns/aardvark-dns-9999.ebuild index cdf0cb032c103..1e5d082427fea 100644 --- a/app-containers/aardvark-dns/aardvark-dns-9999.ebuild +++ b/app-containers/aardvark-dns/aardvark-dns-9999.ebuild @@ -38,7 +38,7 @@ src_unpack() { src_prepare() { default - sed -i -e "s|m0755 bin|m0755 target/$(usex debug debug release)|g;" Makefile || die + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die } src_install() { diff --git a/app-containers/netavark/netavark-1.10.2.ebuild b/app-containers/netavark/netavark-1.10.2.ebuild index a18be8dea54d3..42ba29c8332d6 100644 --- a/app-containers/netavark/netavark-1.10.2.ebuild +++ b/app-containers/netavark/netavark-1.10.2.ebuild @@ -44,7 +44,7 @@ src_unpack() { src_prepare() { default - sed -i -e "s|m0755 bin|m0755 target/$(usex debug debug release)|g;" Makefile || die + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die } src_compile() { diff --git a/app-containers/netavark/netavark-1.10.3.ebuild b/app-containers/netavark/netavark-1.10.3.ebuild index d157e0604afce..499417f28d96a 100644 --- a/app-containers/netavark/netavark-1.10.3.ebuild +++ b/app-containers/netavark/netavark-1.10.3.ebuild @@ -44,7 +44,7 @@ src_unpack() { src_prepare() { default - sed -i -e "s|m0755 bin|m0755 target/$(usex debug debug release)|g;" Makefile || die + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die } src_compile() { diff --git a/app-containers/netavark/netavark-1.11.0.ebuild b/app-containers/netavark/netavark-1.11.0.ebuild index a18be8dea54d3..42ba29c8332d6 100644 --- a/app-containers/netavark/netavark-1.11.0.ebuild +++ b/app-containers/netavark/netavark-1.11.0.ebuild @@ -44,7 +44,7 @@ src_unpack() { src_prepare() { default - sed -i -e "s|m0755 bin|m0755 target/$(usex debug debug release)|g;" Makefile || die + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die } src_compile() { diff --git a/app-containers/netavark/netavark-1.9.0.ebuild b/app-containers/netavark/netavark-1.9.0.ebuild index d157e0604afce..499417f28d96a 100644 --- a/app-containers/netavark/netavark-1.9.0.ebuild +++ b/app-containers/netavark/netavark-1.9.0.ebuild @@ -44,7 +44,7 @@ src_unpack() { src_prepare() { default - sed -i -e "s|m0755 bin|m0755 target/$(usex debug debug release)|g;" Makefile || die + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die } src_compile() { diff --git a/app-containers/netavark/netavark-9999.ebuild b/app-containers/netavark/netavark-9999.ebuild index a18be8dea54d3..42ba29c8332d6 100644 --- a/app-containers/netavark/netavark-9999.ebuild +++ b/app-containers/netavark/netavark-9999.ebuild @@ -44,7 +44,7 @@ src_unpack() { src_prepare() { default - sed -i -e "s|m0755 bin|m0755 target/$(usex debug debug release)|g;" Makefile || die + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die } src_compile() { diff --git a/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0.ebuild b/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0.ebuild index 0a0ee9e31c20f..2a08f5e3c9eb1 100644 --- a/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0.ebuild +++ b/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0.ebuild @@ -290,9 +290,9 @@ src_compile() { } src_install() { - newlib.so target/$(usex debug debug release)/librpm_sequoia.so librpm_sequoia.so.1 + newlib.so "$(cargo_target_dir)"/librpm_sequoia.so librpm_sequoia.so.1 dosym librpm_sequoia.so.1 /usr/$(get_libdir)/librpm_sequoia.so insinto /usr/$(get_libdir)/pkgconfig - doins target/$(usex debug debug release)/rpm-sequoia.pc + doins "$(cargo_target_dir)"/rpm-sequoia.pc } diff --git a/app-emulation/ruffle/ruffle-0_p20240422.ebuild b/app-emulation/ruffle/ruffle-0_p20240422.ebuild index 3429c8fc5d644..1c3b4e37a2d70 100644 --- a/app-emulation/ruffle/ruffle-0_p20240422.ebuild +++ b/app-emulation/ruffle/ruffle-0_p20240422.ebuild @@ -742,9 +742,7 @@ src_install() { make_desktop_entry ${PN} ${PN^} ${PN} "AudioVideo;Player;Emulator;" \ "MimeType=application/x-shockwave-flash;application/vnd.adobe.flash.movie;" - # TODO: swap with /gentoo after https://github.com/gentoo/gentoo/pull/29510 - cd target/$(usex debug{,} release) || die - + cd "$(cargo_target_dir)" || die newbin ${PN}_desktop ${PN} newbin exporter ${PN}_exporter dobin ${PN}_scanner diff --git a/app-emulation/ruffle/ruffle-0_p20240521.ebuild b/app-emulation/ruffle/ruffle-0_p20240521.ebuild index 10f2973fbcf65..b7de63ddaf60e 100644 --- a/app-emulation/ruffle/ruffle-0_p20240521.ebuild +++ b/app-emulation/ruffle/ruffle-0_p20240521.ebuild @@ -723,9 +723,7 @@ src_install() { make_desktop_entry ${PN} ${PN^} ${PN} "AudioVideo;Player;Emulator;" \ "MimeType=application/x-shockwave-flash;application/vnd.adobe.flash.movie;" - # TODO: swap with /gentoo after https://github.com/gentoo/gentoo/pull/29510 - cd target/$(usex debug{,} release) || die - + cd "$(cargo_target_dir)" || die newbin ${PN}_desktop ${PN} newbin exporter ${PN}_exporter dobin ${PN}_scanner diff --git a/app-emulation/ruffle/ruffle-9999.ebuild b/app-emulation/ruffle/ruffle-9999.ebuild index 6ceb7a0ae3ba4..457bc5e52efc3 100644 --- a/app-emulation/ruffle/ruffle-9999.ebuild +++ b/app-emulation/ruffle/ruffle-9999.ebuild @@ -75,9 +75,7 @@ src_install() { make_desktop_entry ${PN} ${PN^} ${PN} "AudioVideo;Player;Emulator;" \ "MimeType=application/x-shockwave-flash;application/vnd.adobe.flash.movie;" - # TODO: swap with /gentoo after https://github.com/gentoo/gentoo/pull/29510 - cd target/$(usex debug{,} release) || die - + cd "$(cargo_target_dir)" || die newbin ${PN}_desktop ${PN} newbin exporter ${PN}_exporter dobin ${PN}_scanner diff --git a/app-forensics/yara-x/yara-x-0.4.0.ebuild b/app-forensics/yara-x/yara-x-0.4.0.ebuild index d5ae4cdb0be44..2786cd4fb4d56 100644 --- a/app-forensics/yara-x/yara-x-0.4.0.ebuild +++ b/app-forensics/yara-x/yara-x-0.4.0.ebuild @@ -571,8 +571,8 @@ src_test() { } src_install() { - dobin target/$(usex debug "debug" "release")/yr - dolib.so target/$(usex debug "debug" "release")/*.so + dobin "$(cargo_target_dir)"/yr + dolib.so "$(cargo_target_dir)"/*.so wrap_python ${FUNCNAME} } diff --git a/app-misc/broot/broot-1.36.1.ebuild b/app-misc/broot/broot-1.36.1.ebuild index 04deac4103137..6bb01da740578 100644 --- a/app-misc/broot/broot-1.36.1.ebuild +++ b/app-misc/broot/broot-1.36.1.ebuild @@ -367,7 +367,7 @@ src_install() { doman "${T}"/${PN}.1 - local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out ) + local build_dir=( "$(cargo_target_dir)"/build/${PN}-*/out ) cd ${build_dir[0]} || die newbashcomp ${PN}.bash ${PN} diff --git a/app-portage/emlop/emlop-0.6.1.ebuild b/app-portage/emlop/emlop-0.6.1.ebuild index c158e638ce1ec..94b04a9ae870d 100644 --- a/app-portage/emlop/emlop-0.6.1.ebuild +++ b/app-portage/emlop/emlop-0.6.1.ebuild @@ -100,12 +100,12 @@ src_install() { cargo_src_install dodoc README.md CHANGELOG.md # bash - ./target/$(usex debug debug release)/emlop complete bash > emlop || die + "$(cargo_target_dir)"/emlop complete bash > emlop || die dobashcomp emlop # zsh - ./target/$(usex debug debug release)/emlop complete zsh > _emlop || die + "$(cargo_target_dir)"/emlop complete zsh > _emlop || die dozshcomp _emlop # fish - ./target/$(usex debug debug release)/emlop complete fish > emlop.fish || die + "$(cargo_target_dir)"/emlop complete fish > emlop.fish || die dofishcomp emlop.fish } diff --git a/app-portage/emlop/emlop-0.7.0.ebuild b/app-portage/emlop/emlop-0.7.0.ebuild index f7a3cb045ab2b..bd064cc27d2f6 100644 --- a/app-portage/emlop/emlop-0.7.0.ebuild +++ b/app-portage/emlop/emlop-0.7.0.ebuild @@ -115,12 +115,12 @@ src_install() { cargo_src_install dodoc README.md CHANGELOG.md emlop.toml # bash - ./target/$(usex debug debug release)/emlop complete bash > emlop || die + "$(cargo_target_dir)"/emlop complete bash > emlop || die dobashcomp emlop # zsh - ./target/$(usex debug debug release)/emlop complete zsh > _emlop || die + "$(cargo_target_dir)"/emlop complete zsh > _emlop || die dozshcomp _emlop # fish - ./target/$(usex debug debug release)/emlop complete fish > emlop.fish || die + "$(cargo_target_dir)"/emlop complete fish > emlop.fish || die dofishcomp emlop.fish } diff --git a/app-shells/atuin/atuin-18.2.0.ebuild b/app-shells/atuin/atuin-18.2.0.ebuild index 246cccde64499..bab19b8834636 100644 --- a/app-shells/atuin/atuin-18.2.0.ebuild +++ b/app-shells/atuin/atuin-18.2.0.ebuild @@ -493,7 +493,7 @@ src_configure() { src_compile() { cargo_src_compile - ATUIN_BIN="target/$(usex debug debug release)/${PN}" + ATUIN_BIN="$(cargo_target_dir)/${PN}" # Prepare shell completion generation mkdir completions || die diff --git a/app-shells/atuin/atuin-18.3.0.ebuild b/app-shells/atuin/atuin-18.3.0.ebuild index dad51de2291ce..94ea5c432867d 100644 --- a/app-shells/atuin/atuin-18.3.0.ebuild +++ b/app-shells/atuin/atuin-18.3.0.ebuild @@ -505,7 +505,7 @@ src_configure() { src_compile() { cargo_src_compile - ATUIN_BIN="target/$(usex debug debug release)/${PN}" + ATUIN_BIN="$(cargo_target_dir)/${PN}" # Prepare shell completion generation mkdir completions || die diff --git a/app-text/mdbook/mdbook-0.4.37.ebuild b/app-text/mdbook/mdbook-0.4.37.ebuild index 2b512da75f1f3..2e29e312d40c4 100644 --- a/app-text/mdbook/mdbook-0.4.37.ebuild +++ b/app-text/mdbook/mdbook-0.4.37.ebuild @@ -269,7 +269,7 @@ src_compile() { if tc-is-cross-compiler; then ewarn "html docs were skipped due to cross-compilation" else - target/$(usex debug{,} release)/${PN} build -d html guide || die + "$(cargo_target_dir)"/${PN} build -d html guide || die fi fi } diff --git a/app-text/mdbook/mdbook-0.4.40.ebuild b/app-text/mdbook/mdbook-0.4.40.ebuild index e5e76b2f6ed64..5adbdeee6234e 100644 --- a/app-text/mdbook/mdbook-0.4.40.ebuild +++ b/app-text/mdbook/mdbook-0.4.40.ebuild @@ -280,7 +280,7 @@ src_compile() { if tc-is-cross-compiler; then ewarn "html docs were skipped due to cross-compilation" else - target/$(usex debug{,} release)/${PN} build -d html guide || die + "$(cargo_target_dir)"/${PN} build -d html guide || die fi fi } diff --git a/dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild b/dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild index c113e7a06b473..78c7d2f5a9d9d 100644 --- a/dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild +++ b/dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild @@ -195,11 +195,11 @@ src_prepare() { src_test() { source "${FILESDIR}/test/features.bash" || die - test-features_main "${PWD}/target/release/starlark" || die + test-features_main "${PWD}/$(cargo_target_dir)/starlark" || die } src_install() { - dobin target/release/starlark + dobin "$(cargo_target_dir)/starlark" ln "${ED}/usr/bin/starlark"{,-rust} || die dodoc -r {docs,{CHANGELOG,README}.md} } diff --git a/dev-util/maturin/maturin-1.4.0.ebuild b/dev-util/maturin/maturin-1.4.0.ebuild index 3cf5c02fedec2..44d0ced2f7049 100644 --- a/dev-util/maturin/maturin-1.4.0.ebuild +++ b/dev-util/maturin/maturin-1.4.0.ebuild @@ -513,7 +513,7 @@ python_compile_all() { use !doc || mdbook build -d html guide || die if ! tc-is-cross-compiler; then - local maturin=target/$(usex debug{,} release)/maturin + local maturin=$(cargo_target_dir)/maturin ${maturin} completions bash > "${T}"/${PN} || die ${maturin} completions fish > "${T}"/${PN}.fish || die ${maturin} completions zsh > "${T}"/_${PN} || die diff --git a/dev-util/maturin/maturin-1.5.1-r1.ebuild b/dev-util/maturin/maturin-1.5.1-r1.ebuild index 9ecde386152b5..211d3fcd65d5d 100644 --- a/dev-util/maturin/maturin-1.5.1-r1.ebuild +++ b/dev-util/maturin/maturin-1.5.1-r1.ebuild @@ -513,7 +513,7 @@ python_compile_all() { use !doc || mdbook build -d html guide || die if ! tc-is-cross-compiler; then - local maturin=target/$(usex debug{,} release)/maturin + local maturin=$(cargo_target_dir)/maturin ${maturin} completions bash > "${T}"/${PN} || die ${maturin} completions fish > "${T}"/${PN}.fish || die ${maturin} completions zsh > "${T}"/_${PN} || die diff --git a/dev-util/maturin/maturin-1.6.0.ebuild b/dev-util/maturin/maturin-1.6.0.ebuild index 05c3f81d01c84..13a38fc10e8b9 100644 --- a/dev-util/maturin/maturin-1.6.0.ebuild +++ b/dev-util/maturin/maturin-1.6.0.ebuild @@ -522,7 +522,7 @@ python_compile_all() { use !doc || mdbook build -d html guide || die if ! tc-is-cross-compiler; then - local maturin=target/$(usex debug{,} release)/maturin + local maturin=$(cargo_target_dir)/maturin ${maturin} completions bash > "${T}"/${PN} || die ${maturin} completions fish > "${T}"/${PN}.fish || die ${maturin} completions zsh > "${T}"/_${PN} || die diff --git a/dev-util/ruff/ruff-0.4.6.ebuild b/dev-util/ruff/ruff-0.4.6.ebuild index cef1ac48c858e..2bb565341a0fd 100644 --- a/dev-util/ruff/ruff-0.4.6.ebuild +++ b/dev-util/ruff/ruff-0.4.6.ebuild @@ -419,7 +419,7 @@ src_compile() { cargo_src_compile --bin ruff local releasedir - releasedir=target/$(usex 'debug' 'debug' 'release') + releasedir=$(cargo_target_dir) ${releasedir}/ruff generate-shell-completion bash > ruff-completion.bash || die ${releasedir}/ruff generate-shell-completion zsh > ruff-completion.zsh || die @@ -435,7 +435,7 @@ src_test() { } src_install() { - local releasedir=target/$(usex 'debug' 'debug' 'release') + local releasedir=$(cargo_target_dir) dobin ${releasedir}/ruff diff --git a/dev-util/ruff/ruff-0.4.7.ebuild b/dev-util/ruff/ruff-0.4.7.ebuild index cef1ac48c858e..2bb565341a0fd 100644 --- a/dev-util/ruff/ruff-0.4.7.ebuild +++ b/dev-util/ruff/ruff-0.4.7.ebuild @@ -419,7 +419,7 @@ src_compile() { cargo_src_compile --bin ruff local releasedir - releasedir=target/$(usex 'debug' 'debug' 'release') + releasedir=$(cargo_target_dir) ${releasedir}/ruff generate-shell-completion bash > ruff-completion.bash || die ${releasedir}/ruff generate-shell-completion zsh > ruff-completion.zsh || die @@ -435,7 +435,7 @@ src_test() { } src_install() { - local releasedir=target/$(usex 'debug' 'debug' 'release') + local releasedir=$(cargo_target_dir) dobin ${releasedir}/ruff diff --git a/dev-util/ruff/ruff-0.4.8.ebuild b/dev-util/ruff/ruff-0.4.8.ebuild index c4d41afe50c1a..36e64564b3148 100644 --- a/dev-util/ruff/ruff-0.4.8.ebuild +++ b/dev-util/ruff/ruff-0.4.8.ebuild @@ -415,7 +415,7 @@ src_compile() { cargo_src_compile --bin ruff local releasedir - releasedir=target/$(usex 'debug' 'debug' 'release') + releasedir=$(cargo_target_dir) ${releasedir}/ruff generate-shell-completion bash > ruff-completion.bash || die ${releasedir}/ruff generate-shell-completion zsh > ruff-completion.zsh || die @@ -431,7 +431,7 @@ src_test() { } src_install() { - local releasedir=target/$(usex 'debug' 'debug' 'release') + local releasedir=$(cargo_target_dir) dobin ${releasedir}/ruff diff --git a/dev-vcs/git-absorb/git-absorb-0.6.11-r1.ebuild b/dev-vcs/git-absorb/git-absorb-0.6.11-r1.ebuild index ae2ac7412a63e..8bc9867defb2d 100644 --- a/dev-vcs/git-absorb/git-absorb-0.6.11-r1.ebuild +++ b/dev-vcs/git-absorb/git-absorb-0.6.11-r1.ebuild @@ -96,7 +96,7 @@ QA_FLAGS_IGNORED="usr/bin/${PN}" src_compile() { cargo_src_compile - GIT_ABSORB_BIN="target/$(usex debug debug release)/${PN}" + GIT_ABSORB_BIN="$(cargo_target_dir)/${PN}" # Prepare shell completion generation mkdir completions || die diff --git a/dev-vcs/git-absorb/git-absorb-0.6.13-r1.ebuild b/dev-vcs/git-absorb/git-absorb-0.6.13-r1.ebuild index 11e455e2c06d3..133c6490b757b 100644 --- a/dev-vcs/git-absorb/git-absorb-0.6.13-r1.ebuild +++ b/dev-vcs/git-absorb/git-absorb-0.6.13-r1.ebuild @@ -132,7 +132,7 @@ src_compile() { cargo_src_compile - GIT_ABSORB_BIN="target/$(usex debug debug release)/${PN}" + GIT_ABSORB_BIN="$(cargo_target_dir)/${PN}" # Prepare shell completion generation mkdir completions || die diff --git a/dev-vcs/git-absorb/git-absorb-0.6.13.ebuild b/dev-vcs/git-absorb/git-absorb-0.6.13.ebuild index 116da04f2de99..2b900da6e9b8f 100644 --- a/dev-vcs/git-absorb/git-absorb-0.6.13.ebuild +++ b/dev-vcs/git-absorb/git-absorb-0.6.13.ebuild @@ -124,7 +124,7 @@ QA_FLAGS_IGNORED="usr/bin/${PN}" src_compile() { cargo_src_compile - GIT_ABSORB_BIN="target/$(usex debug debug release)/${PN}" + GIT_ABSORB_BIN="$(cargo_target_dir)/${PN}" # Prepare shell completion generation mkdir completions || die diff --git a/dev-vcs/mercurial/mercurial-6.5.3.ebuild b/dev-vcs/mercurial/mercurial-6.5.3.ebuild index 69931dc438d2d..ab3945e86821a 100644 --- a/dev-vcs/mercurial/mercurial-6.5.3.ebuild +++ b/dev-vcs/mercurial/mercurial-6.5.3.ebuild @@ -281,7 +281,7 @@ python_install_all() { RM_CONTRIB+=( chg ) fi if use rust; then - dobin rust/target/release/rhg + dobin "rust/$(cargo_target_dir)/rhg" fi for f in ${RM_CONTRIB[@]}; do diff --git a/dev-vcs/mercurial/mercurial-6.6.2.ebuild b/dev-vcs/mercurial/mercurial-6.6.2.ebuild index c5b2c982def79..6e0daef5f51e2 100644 --- a/dev-vcs/mercurial/mercurial-6.6.2.ebuild +++ b/dev-vcs/mercurial/mercurial-6.6.2.ebuild @@ -291,7 +291,7 @@ python_install_all() { RM_CONTRIB+=( chg ) fi if use rust; then - dobin rust/target/release/rhg + dobin "rust/$(cargo_target_dir)/rhg" fi for f in ${RM_CONTRIB[@]}; do diff --git a/dev-vcs/mercurial/mercurial-6.7.4.ebuild b/dev-vcs/mercurial/mercurial-6.7.4.ebuild index 1991a7cdef9bb..90e4f75518508 100644 --- a/dev-vcs/mercurial/mercurial-6.7.4.ebuild +++ b/dev-vcs/mercurial/mercurial-6.7.4.ebuild @@ -302,7 +302,7 @@ python_install_all() { RM_CONTRIB+=( chg ) fi if use rust; then - dobin rust/target/release/rhg + dobin "rust/$(cargo_target_dir)/rhg" fi for f in ${RM_CONTRIB[@]}; do diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild index 6b16f427545aa..d271835b76987 100644 --- a/dev-vcs/mercurial/mercurial-9999.ebuild +++ b/dev-vcs/mercurial/mercurial-9999.ebuild @@ -130,7 +130,7 @@ python_install_all() { RM_CONTRIB+=( chg ) fi if use rust; then - dobin rust/target/release/rhg + dobin "rust/$(cargo_target_dir)/rhg" fi for f in ${RM_CONTRIB[@]}; do diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass index 548aaef3ed697..7db34efb4e174 100644 --- a/eclass/cargo.eclass +++ b/eclass/cargo.eclass @@ -319,6 +319,16 @@ _cargo_gen_git_config() { fi } +# @FUNCTION: cargo_target_dir +# @DESCRIPTION: +# Return the directory within target that contains the build, e.g. +# target/aarch64-unknown-linux-gnu/release. +cargo_target_dir() { + local abi + tc-is-cross-compiler && abi=/$(rust_abi) + echo "${CARGO_TARGET_DIR:-target}${abi}/$(usex debug debug release)" +} + # @FUNCTION: cargo_src_unpack # @DESCRIPTION: # Unpacks the package and the cargo registry. diff --git a/gui-libs/greetd/greetd-0.10.0.ebuild b/gui-libs/greetd/greetd-0.10.0.ebuild index 5e4a733651a23..1969369022d9a 100644 --- a/gui-libs/greetd/greetd-0.10.0.ebuild +++ b/gui-libs/greetd/greetd-0.10.0.ebuild @@ -107,10 +107,7 @@ src_compile() { } src_install() { - # if USE=debug, install binaries from the debug directory; else - # install binaries from the release directory - # https://bugs.gentoo.org/889052 - dobin target/$(usex debug debug release)/{agreety,fakegreet,greetd} + dobin "$(cargo_target_dir)"/{agreety,fakegreet,greetd} insinto /etc/greetd doins config.toml diff --git a/gui-libs/greetd/greetd-0.9.0.ebuild b/gui-libs/greetd/greetd-0.9.0.ebuild index b90a0f18ce5dc..e8411fc22c871 100644 --- a/gui-libs/greetd/greetd-0.9.0.ebuild +++ b/gui-libs/greetd/greetd-0.9.0.ebuild @@ -94,10 +94,7 @@ src_compile() { } src_install() { - # if USE=debug, install binaries from the debug directory; else - # install binaries from the release directory - # https://bugs.gentoo.org/889052 - dobin target/$(usex debug debug release)/{agreety,fakegreet,greetd} + dobin "$(cargo_target_dir)"/{agreety,fakegreet,greetd} insinto /etc/greetd doins config.toml diff --git a/net-misc/geckodriver/geckodriver-0.34.0.ebuild b/net-misc/geckodriver/geckodriver-0.34.0.ebuild index 197a6abe60054..f06e338bad601 100644 --- a/net-misc/geckodriver/geckodriver-0.34.0.ebuild +++ b/net-misc/geckodriver/geckodriver-0.34.0.ebuild @@ -224,6 +224,6 @@ src_install() { mkdir -p "${D}"/usr/$(get_libdir)/firefox || die "Failed to create /usr/lib*/firefox directory." exeinto /usr/$(get_libdir)/firefox - doexe target/release/geckodriver + doexe "$(cargo_target_dir)"/geckodriver dosym -r /usr/$(get_libdir)/firefox/geckodriver /usr/bin/geckodriver } diff --git a/net-misc/hurl/hurl-4.1.0.ebuild b/net-misc/hurl/hurl-4.1.0.ebuild index f180dcb7aa7aa..856d7cca73a5a 100644 --- a/net-misc/hurl/hurl-4.1.0.ebuild +++ b/net-misc/hurl/hurl-4.1.0.ebuild @@ -195,8 +195,7 @@ QA_FLAGS_IGNORED=( QA_PRESTRIPPED="${QA_FLAGS_IGNORED[*]}" src_install() { - local target_dir="$(usex debug debug release)" - dobin target/"${target_dir}"/hurl{,fmt} + dobin "$(cargo_target_dir)"/hurl{,fmt} doman docs/manual/hurl{,fmt}.1 dodoc CHANGELOG.md README.md LICENSE diff --git a/sys-apps/bat/bat-0.23.0-r1.ebuild b/sys-apps/bat/bat-0.23.0-r1.ebuild index b0f52777c924c..0a4601f4acbff 100644 --- a/sys-apps/bat/bat-0.23.0-r1.ebuild +++ b/sys-apps/bat/bat-0.23.0-r1.ebuild @@ -218,8 +218,8 @@ src_install() { einstalldocs - local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out ) - cd ${build_dir[0]} || die "Cannot change directory to ${PN} build" + local build_dir=( "$(cargo_target_dir)"/build/${PN}-*/out ) + cd "${build_dir[0]}" || die "Cannot change directory to ${PN} build" doman assets/manual/bat.1 diff --git a/sys-apps/bat/bat-0.24.0-r1.ebuild b/sys-apps/bat/bat-0.24.0-r1.ebuild index 0c0d2c793320e..ada5fae6a7d50 100644 --- a/sys-apps/bat/bat-0.24.0-r1.ebuild +++ b/sys-apps/bat/bat-0.24.0-r1.ebuild @@ -247,8 +247,8 @@ src_install() { einstalldocs - local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out ) - cd ${build_dir[0]} || die "Cannot change directory to ${PN} build" + local build_dir=( "$(cargo_target_dir)"/build/${PN}-*/out ) + cd "${build_dir[0]}" || die "Cannot change directory to ${PN} build" doman assets/manual/bat.1 diff --git a/sys-apps/ripgrep/ripgrep-14.1.0.ebuild b/sys-apps/ripgrep/ripgrep-14.1.0.ebuild index 97d8367a346ec..904eb11c2b635 100644 --- a/sys-apps/ripgrep/ripgrep-14.1.0.ebuild +++ b/sys-apps/ripgrep/ripgrep-14.1.0.ebuild @@ -99,21 +99,21 @@ src_install() { cargo_src_install newbashcomp - rg <<-EOF - $(target/$(usex debug debug release)/rg --generate complete-bash) + "$(cargo_target_dir)"/rg --generate complete-bash) EOF insinto /usr/share/fish/vendor_completions.d newins - rg.fish <<-EOF - $(target/$(usex debug debug release)/rg --generate complete-fish) + "$(cargo_target_dir)"/rg --generate complete-fish) EOF insinto /usr/share/zsh/site-functions newins - _rg <<-EOF - $(target/$(usex debug debug release)/rg --generate complete-zsh) + "$(cargo_target_dir)"/rg --generate complete-zsh) EOF dodoc CHANGELOG.md FAQ.md GUIDE.md README.md newman - rg.1 <<-EOF - $(target/$(usex debug debug release)/rg --generate man) + "$(cargo_target_dir)"/rg --generate man) EOF } diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.10.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.10.ebuild index df14c873276f4..6907ab3f3bb5d 100644 --- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.10.ebuild +++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.10.ebuild @@ -175,7 +175,7 @@ src_install() { emake \ DESTDIR="${D}" \ DATADIR="${ED}/usr/share" \ - PDATA_TOOLS="target/$(usex debug debug release)/pdata_tools" \ + PDATA_TOOLS="$(cargo_target_dir)/pdata_tools" \ install einstalldocs diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild index 021c5e9a4b08d..d617bae938482 100644 --- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild +++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild @@ -175,7 +175,7 @@ src_install() { emake \ DESTDIR="${D}" \ DATADIR="${ED}/usr/share" \ - PDATA_TOOLS="target/$(usex debug debug release)/pdata_tools" \ + PDATA_TOOLS="$(cargo_target_dir)/pdata_tools" \ install einstalldocs diff --git a/sys-process/procs/procs-0.14.4.ebuild b/sys-process/procs/procs-0.14.4.ebuild index ed9880991d016..fd08a1055ff80 100644 --- a/sys-process/procs/procs-0.14.4.ebuild +++ b/sys-process/procs/procs-0.14.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Autogenerated by pycargoebuild 0.6.3 @@ -280,14 +280,14 @@ QA_FLAGS_IGNORED="usr/bin/procs" src_install() { cargo_src_install - target/$(usex debug debug release)/procs --gen-completion bash || die + "$(cargo_target_dir)"/procs --gen-completion bash || die newbashcomp procs.bash procs - target/$(usex debug debug release)/procs --gen-completion zsh || die + "$(cargo_target_dir)"/procs --gen-completion zsh || die insinto /usr/share/zsh/site-functions doins _procs - target/$(usex debug debug release)/procs --gen-completion fish || die + "$(cargo_target_dir)"/procs --gen-completion fish || die insinto /usr/share/fish/vendor_completions.d doins procs.fish } diff --git a/sys-process/procs/procs-0.14.5.ebuild b/sys-process/procs/procs-0.14.5.ebuild index a306320fc092c..5447e7e7fc4c4 100644 --- a/sys-process/procs/procs-0.14.5.ebuild +++ b/sys-process/procs/procs-0.14.5.ebuild @@ -308,14 +308,14 @@ QA_FLAGS_IGNORED="usr/bin/procs" src_install() { cargo_src_install - target/$(usex debug debug release)/procs --gen-completion bash || die + "$(cargo_target_dir)"/procs --gen-completion bash || die newbashcomp procs.bash procs - target/$(usex debug debug release)/procs --gen-completion zsh || die + "$(cargo_target_dir)"/procs --gen-completion zsh || die insinto /usr/share/zsh/site-functions doins _procs - target/$(usex debug debug release)/procs --gen-completion fish || die + "$(cargo_target_dir)"/procs --gen-completion fish || die insinto /usr/share/fish/vendor_completions.d doins procs.fish } diff --git a/x11-terms/wezterm/wezterm-20240203.110809-r1.ebuild b/x11-terms/wezterm/wezterm-20240203.110809-r1.ebuild index fd4219ce6f51f..ec05957da6955 100644 --- a/x11-terms/wezterm/wezterm-20240203.110809-r1.ebuild +++ b/x11-terms/wezterm/wezterm-20240203.110809-r1.ebuild @@ -791,10 +791,10 @@ src_compile() { src_install() { exeinto /usr/bin - doexe target/$(usex debug "debug" "release")/wezterm - doexe target/$(usex debug "debug" "release")/wezterm-gui - doexe target/$(usex debug "debug" "release")/wezterm-mux-server - doexe target/$(usex debug "debug" "release")/strip-ansi-escapes + doexe "$(cargo_target_dir)/wezterm" + doexe "$(cargo_target_dir)/wezterm-gui" + doexe "$(cargo_target_dir)/wezterm-mux-server" + doexe "$(cargo_target_dir)/strip-ansi-escapes" insinto /usr/share/icons/hicolor/128x128/apps newins assets/icon/terminal.png org.wezfurlong.wezterm.png