mozconfig-v6.60.eclass: backport rust and cargo dep fix
authorThomas Deutschmann <whissi@gentoo.org>
Thu, 27 Sep 2018 14:44:40 +0000 (16:44 +0200)
committerThomas Deutschmann <whissi@gentoo.org>
Thu, 27 Sep 2018 16:19:07 +0000 (18:19 +0200)
Based on commit 8bdeaa7fceb519062fd2cc6517489c69c86d3016.

Bug: https://bugs.gentoo.org/646078
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
eclass/mozconfig-v6.60.eclass

index f8b6b65811f74e365f43ac9c81e962cb1e24eeda..c124baef74e6abfd274a16939c666b621f105bef 100644 (file)
@@ -153,17 +153,17 @@ fi
 
 DEPEND="app-arch/zip
        app-arch/unzip
-       >=sys-devel/binutils-2.16.1
+       >=sys-devel/binutils-2.30
        sys-apps/findutils
        pulseaudio? ( media-sound/pulseaudio )
-       elibc_glibc? ( || (
-               ( >=dev-lang/rust-1.24.0[-extended(-)] >=dev-util/cargo-0.25.0 )
-               >=dev-lang/rust-1.24.0[extended]
-               ( >=dev-lang/rust-bin-1.24.0 >=dev-util/cargo-0.25.0 )
-       ) )
-       elibc_musl? ( || ( >=dev-lang/rust-1.24.0
-               >=dev-util/cargo-0.25.0
-       ) )
+       elibc_glibc? (
+               virtual/cargo
+               virtual/rust
+       )
+       elibc_musl? (
+               virtual/cargo
+               virtual/rust
+       )
        ${RDEPEND}"
 
 RDEPEND+="