From: Thomas Deutschmann <whissi@gentoo.org>
Date: Sat, 22 Sep 2018 12:36:40 +0000 (+0200)
Subject: www-client/firefox: use virtual/{rust,cargo}
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8bdeaa7fceb519062fd2cc6517489c69c86d3016;p=gentoo.git

www-client/firefox: use virtual/{rust,cargo}

Bug: https://bugs.gentoo.org/646078
Package-Manager: Portage-2.3.49, Repoman-2.3.10
---

diff --git a/www-client/firefox/firefox-62.0.2.ebuild b/www-client/firefox/firefox-62.0.2.ebuild
index 61b4fa494931..ccfa9cb9c55b 100644
--- a/www-client/firefox/firefox-62.0.2.ebuild
+++ b/www-client/firefox/firefox-62.0.2.ebuild
@@ -106,14 +106,14 @@ DEPEND="${CDEPEND}
 	>=sys-devel/binutils-2.16.1
 	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
+	)
 	>=sys-devel/llvm-4.0.1
 	>=sys-devel/clang-4.0.1
 	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )