From cc7ba6a5789275b7efeb85902b438c211f05294f Mon Sep 17 00:00:00 2001 From: "ingenarel (NeoJesus)" Date: Tue, 8 Sep 2026 22:56:02 +0600 Subject: [PATCH] */*: change rust project's hardcoded target/release path [3/4] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See the previous 2nd commit to see more info for the files changed in this commit, there wasn't any problem with how the path was being handled per se however, it was getting the path via ``` target/$(usex debug debug release) ``` but cargo_target_dir from cargo.eclass already exists. Hence, I changed it to this so the ebuilds in the tree are more consistent Signed-off-by: ingenarel (NeoJesus) Part-of: https://codeberg.org/gentoo/guru/pulls/21 Signed-off-by: Michał Górny --- app-portage/gpkg/gpkg-1.4.0.ebuild | 4 +--- media-sound/spotify-adblock/spotify-adblock-1.0.1.ebuild | 2 +- media-sound/spotify-adblock/spotify-adblock-1.0.2.ebuild | 2 +- media-sound/spotify-adblock/spotify-adblock-1.0.3.ebuild | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app-portage/gpkg/gpkg-1.4.0.ebuild b/app-portage/gpkg/gpkg-1.4.0.ebuild index 7335ebfb38..294cc563d5 100644 --- a/app-portage/gpkg/gpkg-1.4.0.ebuild +++ b/app-portage/gpkg/gpkg-1.4.0.ebuild @@ -536,9 +536,7 @@ src_install() { # would fail because gpkg-daemon doesn't define the GUI features). # cargo.eclass honors USE=debug: target/debug/ when debug is set, # target/release/ otherwise — see bug 975866. - local target_dir="target/$(usex debug debug release)" - dobin "${target_dir}/gpkg-daemon" - dobin "${target_dir}/gpkg" + dobin "$(cargo_target_dir)/"gpkg{,-daemon} # D-Bus system bus configuration insinto /etc/dbus-1/system.d diff --git a/media-sound/spotify-adblock/spotify-adblock-1.0.1.ebuild b/media-sound/spotify-adblock/spotify-adblock-1.0.1.ebuild index 6dff059769..ff19e5c10c 100644 --- a/media-sound/spotify-adblock/spotify-adblock-1.0.1.ebuild +++ b/media-sound/spotify-adblock/spotify-adblock-1.0.1.ebuild @@ -59,7 +59,7 @@ src_install(){ dobin "${T}/spotify-adblock" # library - newlib.so target/$(usex debug debug release)/libspotifyadblock.so ${PN}.so + newlib.so "$(cargo_target_dir)/libspotifyadblock.so" "${PN}.so" # config insinto "/etc/${PN}" diff --git a/media-sound/spotify-adblock/spotify-adblock-1.0.2.ebuild b/media-sound/spotify-adblock/spotify-adblock-1.0.2.ebuild index 2357695245..06b6403c4f 100644 --- a/media-sound/spotify-adblock/spotify-adblock-1.0.2.ebuild +++ b/media-sound/spotify-adblock/spotify-adblock-1.0.2.ebuild @@ -59,7 +59,7 @@ src_install(){ dobin "${T}/spotify-adblock" # library - newlib.so target/$(usex debug debug release)/libspotifyadblock.so ${PN}.so + newlib.so "$(cargo_target_dir)/libspotifyadblock.so" "${PN}.so" # config insinto "/etc/${PN}" diff --git a/media-sound/spotify-adblock/spotify-adblock-1.0.3.ebuild b/media-sound/spotify-adblock/spotify-adblock-1.0.3.ebuild index debfdfc589..ae8a7d9ce6 100644 --- a/media-sound/spotify-adblock/spotify-adblock-1.0.3.ebuild +++ b/media-sound/spotify-adblock/spotify-adblock-1.0.3.ebuild @@ -63,7 +63,7 @@ src_install(){ dobin "${T}/spotify-adblock" # library - newlib.so target/$(usex debug debug release)/libspotifyadblock.so ${PN}.so + newlib.so "$(cargo_target_dir)/libspotifyadblock.so" "${PN}.so" # config insinto "/etc/${PN}"