From: Thomas Deutschmann <whissi@gentoo.org>
Date: Thu, 27 Sep 2018 14:44:40 +0000 (+0200)
Subject: mozconfig-v6.60.eclass: backport rust and cargo dep fix
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0d7d67562dfc8734534b7df669d06a0caabc4078;p=gentoo.git

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@gentoo.org>
---

diff --git a/eclass/mozconfig-v6.60.eclass b/eclass/mozconfig-v6.60.eclass
index f8b6b65811f7..c124baef74e6 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+="