commit: 7dcd4a38bc022fc30526bfcd94d585c52ac2792a
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 30 04:05:36 2018 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Tue Jan 30 04:05:36 2018 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=7dcd4a38
adjust rust atoms for {firefox,mozconfig}-58 to match portage, from
Arfrever's suggestion in bug 646078
eclass/mozconfig-v6.58.eclass | 11 +++++++----
www-client/firefox/firefox-58.0.1.ebuild | 2 --
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/eclass/mozconfig-v6.58.eclass b/eclass/mozconfig-v6.58.eclass
index c77e88e..c0a337e 100644
--- a/eclass/mozconfig-v6.58.eclass
+++ b/eclass/mozconfig-v6.58.eclass
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
#
-# @ECLASS: mozconfig-v6.57.eclass
+# @ECLASS: mozconfig-v6.58.eclass
# @MAINTAINER:
# mozilla team <mozi...@gentoo.org>
# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6
@@ -165,8 +165,11 @@ DEPEND="app-arch/zip
>=sys-devel/binutils-2.16.1
sys-apps/findutils
pulseaudio? ( media-sound/pulseaudio )
- >=virtual/rust-1.19.0
- dev-util/cargo
+ || (
+ ( >=dev-lang/rust-1.21.0 >=dev-util/cargo-0.22.0 )
+ >=dev-lang/rust-1.21.0[extended]
+ ( >=dev-lang/rust-bin-1.21.0 >=dev-util/cargo-0.22.0 )
+ )
${RDEPEND}"
RDEPEND+="
diff --git a/www-client/firefox/firefox-58.0.1.ebuild
b/www-client/firefox/firefox-58.0.1.ebuild
index 4bcc046..02c0a80 100644
--- a/www-client/firefox/firefox-58.0.1.ebuild
+++ b/www-client/firefox/firefox-58.0.1.ebuild
@@ -56,8 +56,6 @@ RDEPEND="
selinux? ( sec-policy/selinux-mozilla )"
DEPEND="${RDEPEND}
- >=virtual/rust-1.21.0
- >=dev-util/cargo-0.22.0
>=sys-devel/llvm-4.0.1
>=sys-devel/clang-4.0.1
amd64? ( ${ASM_DEPEND} virtual/opengl )
