commit:     0d7d67562dfc8734534b7df669d06a0caabc4078
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 27 14:44:40 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Sep 27 16:19:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d7d6756

mozconfig-v6.60.eclass: backport rust and cargo dep fix

Based on commit 8bdeaa7fceb519062fd2cc6517489c69c86d3016.

Bug: https://bugs.gentoo.org/646078
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 eclass/mozconfig-v6.60.eclass | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/eclass/mozconfig-v6.60.eclass b/eclass/mozconfig-v6.60.eclass
index f8b6b65811f..c124baef74e 100644
--- a/eclass/mozconfig-v6.60.eclass
+++ b/eclass/mozconfig-v6.60.eclass
@@ -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+="

Reply via email to