dev-lang/rust: correct multilib libraries paths

Package-Manager: Portage-2.3.39, Repoman-2.3.9

diff --git a/dev-lang/rust/rust-1.26.0-r1.ebuild b/dev-lang/rust/rust-1.26.0-r2.ebuild
similarity index 97%
rename from dev-lang/rust/rust-1.26.0-r1.ebuild
rename to dev-lang/rust/rust-1.26.0-r2.ebuild
index fe5052b39aaa79b1f4ba4194d2ea46ab9ffb1667..4a0bbfdb7ec6e452d4abd630aac630752da95c5d 100644 (file)
--- a/dev-lang/rust/rust-1.26.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.26.0-r2.ebuild
@@ -117,7 +117,7 @@ src_configure() {
                extended = $(toml_usex extended)
                [install]
                prefix = "${EPREFIX}/usr"
-               libdir = "$(get_libdir)/${P}"
+               libdir = "$(get_libdir)"
                docdir = "share/doc/${P}"
                mandir = "share/${P}/man"
                [rust]
@@ -172,12 +172,14 @@ src_install() {
                abi_libdir=$(get_abi_LIBDIR ${v##*.})
                rust_target=$(get_abi_CHOST ${v##*.})
                mkdir -p ${D}/usr/${abi_libdir}
-               cp ${D}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib/*.so \
+               cp ${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib/*.so \
                   ${D}/usr/${abi_libdir} || die
        done
 
        dodoc COPYRIGHT
 
+       # FIXME:
+       # Really not sure if that env is needed, specailly LDPATH
        cat <<-EOF > "${T}"/50${P}
                LDPATH="/usr/$(get_libdir)/${P}"
                MANPATH="/usr/share/${P}/man"