| 1 |
commit: 7dcd4a38bc022fc30526bfcd94d585c52ac2792a |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 30 04:05:36 2018 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 30 04:05:36 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=7dcd4a38 |
| 7 |
|
| 8 |
adjust rust atoms for {firefox,mozconfig}-58 to match portage, from |
| 9 |
Arfrever's suggestion in bug 646078 |
| 10 |
|
| 11 |
eclass/mozconfig-v6.58.eclass | 11 +++++++---- |
| 12 |
www-client/firefox/firefox-58.0.1.ebuild | 2 -- |
| 13 |
2 files changed, 7 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/mozconfig-v6.58.eclass b/eclass/mozconfig-v6.58.eclass |
| 16 |
index c77e88e..c0a337e 100644 |
| 17 |
--- a/eclass/mozconfig-v6.58.eclass |
| 18 |
+++ b/eclass/mozconfig-v6.58.eclass |
| 19 |
@@ -1,7 +1,7 @@ |
| 20 |
-# Copyright 1999-2017 Gentoo Foundation |
| 21 |
+# Copyright 1999-2018 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
# |
| 24 |
-# @ECLASS: mozconfig-v6.57.eclass |
| 25 |
+# @ECLASS: mozconfig-v6.58.eclass |
| 26 |
# @MAINTAINER: |
| 27 |
# mozilla team <mozilla@g.o> |
| 28 |
# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6 |
| 29 |
@@ -165,8 +165,11 @@ DEPEND="app-arch/zip |
| 30 |
>=sys-devel/binutils-2.16.1 |
| 31 |
sys-apps/findutils |
| 32 |
pulseaudio? ( media-sound/pulseaudio ) |
| 33 |
- >=virtual/rust-1.19.0 |
| 34 |
- dev-util/cargo |
| 35 |
+ || ( |
| 36 |
+ ( >=dev-lang/rust-1.21.0 >=dev-util/cargo-0.22.0 ) |
| 37 |
+ >=dev-lang/rust-1.21.0[extended] |
| 38 |
+ ( >=dev-lang/rust-bin-1.21.0 >=dev-util/cargo-0.22.0 ) |
| 39 |
+ ) |
| 40 |
${RDEPEND}" |
| 41 |
|
| 42 |
RDEPEND+=" |
| 43 |
|
| 44 |
diff --git a/www-client/firefox/firefox-58.0.1.ebuild b/www-client/firefox/firefox-58.0.1.ebuild |
| 45 |
index 4bcc046..02c0a80 100644 |
| 46 |
--- a/www-client/firefox/firefox-58.0.1.ebuild |
| 47 |
+++ b/www-client/firefox/firefox-58.0.1.ebuild |
| 48 |
@@ -56,8 +56,6 @@ RDEPEND=" |
| 49 |
selinux? ( sec-policy/selinux-mozilla )" |
| 50 |
|
| 51 |
DEPEND="${RDEPEND} |
| 52 |
- >=virtual/rust-1.21.0 |
| 53 |
- >=dev-util/cargo-0.22.0 |
| 54 |
>=sys-devel/llvm-4.0.1 |
| 55 |
>=sys-devel/clang-4.0.1 |
| 56 |
amd64? ( ${ASM_DEPEND} virtual/opengl ) |
Archives