dev-lang/rust: fix wasm deps
authorGeorgy Yakovlev <gyakovlev@gentoo.org>
Mon, 30 Mar 2020 18:34:09 +0000 (11:34 -0700)
committerGeorgy Yakovlev <gyakovlev@gentoo.org>
Mon, 30 Mar 2020 22:22:24 +0000 (15:22 -0700)
skip revbumps, because wasm is not widely used,
so users without wasm are not forced to rebuild.

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
dev-lang/rust/rust-1.41.1.ebuild
dev-lang/rust/rust-1.42.0.ebuild

index bcd7281b8c811da3e033ccf632e7a865934c9a98..2f815fa79c82388d2387dfef664d2212a55571b7 100644 (file)
@@ -51,9 +51,9 @@ IUSE="clippy cpu_flags_x86_sse2 debug doc libressl nightly parallel-compiler rls
 LLVM_DEPEND="
        || (
                sys-devel/llvm:9[llvm_targets_WebAssembly?]
-               wasm? ( =sys-devel/lld-9* )
        )
        <sys-devel/llvm-10:=
+       wasm? ( sys-devel/lld )
 "
 LLVM_MAX_SLOT=9
 
index 196b58683e690435b57df8becfbeca0ba445a519..1b72b56f8df41de66cf5c9f13223f326a6255121 100644 (file)
@@ -52,13 +52,13 @@ LLVM_DEPEND="
        || (
                sys-devel/llvm:10[${LLVM_TARGET_USEDEPS// /,}]
                sys-devel/llvm:9[${LLVM_TARGET_USEDEPS// /,}]
-               wasm? ( >=sys-devel/lld-9 )
        )
        <sys-devel/llvm-11:=
+       wasm? ( sys-devel/lld )
 "
 LLVM_MAX_SLOT=10
 
-BOOTSTRAP_DEPEND="|| ( >=dev-lang/rust-1.$(($(ver_cut 2) - 1)).0-r1 >=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1)) )"
+BOOTSTRAP_DEPEND="|| ( >=dev-lang/rust-1.$(($(ver_cut 2) - 1)) >=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1)) )"
 
 COMMON_DEPEND="
        net-libs/libssh2:=
@@ -267,7 +267,6 @@ src_configure() {
                        EOF
                fi
        done
-
        if use wasm; then
                cat <<- EOF >> "${S}"/config.toml
                        [target.wasm32-unknown-unknown]