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}"