| 1 |
commit: 0d7d67562dfc8734534b7df669d06a0caabc4078 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 27 14:44:40 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 27 16:19:07 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d7d6756 |
| 7 |
|
| 8 |
mozconfig-v6.60.eclass: backport rust and cargo dep fix |
| 9 |
|
| 10 |
Based on commit 8bdeaa7fceb519062fd2cc6517489c69c86d3016. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/646078 |
| 13 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 14 |
|
| 15 |
eclass/mozconfig-v6.60.eclass | 18 +++++++++--------- |
| 16 |
1 file changed, 9 insertions(+), 9 deletions(-) |
| 17 |
|
| 18 |
diff --git a/eclass/mozconfig-v6.60.eclass b/eclass/mozconfig-v6.60.eclass |
| 19 |
index f8b6b65811f..c124baef74e 100644 |
| 20 |
--- a/eclass/mozconfig-v6.60.eclass |
| 21 |
+++ b/eclass/mozconfig-v6.60.eclass |
| 22 |
@@ -153,17 +153,17 @@ fi |
| 23 |
|
| 24 |
DEPEND="app-arch/zip |
| 25 |
app-arch/unzip |
| 26 |
- >=sys-devel/binutils-2.16.1 |
| 27 |
+ >=sys-devel/binutils-2.30 |
| 28 |
sys-apps/findutils |
| 29 |
pulseaudio? ( media-sound/pulseaudio ) |
| 30 |
- elibc_glibc? ( || ( |
| 31 |
- ( >=dev-lang/rust-1.24.0[-extended(-)] >=dev-util/cargo-0.25.0 ) |
| 32 |
- >=dev-lang/rust-1.24.0[extended] |
| 33 |
- ( >=dev-lang/rust-bin-1.24.0 >=dev-util/cargo-0.25.0 ) |
| 34 |
- ) ) |
| 35 |
- elibc_musl? ( || ( >=dev-lang/rust-1.24.0 |
| 36 |
- >=dev-util/cargo-0.25.0 |
| 37 |
- ) ) |
| 38 |
+ elibc_glibc? ( |
| 39 |
+ virtual/cargo |
| 40 |
+ virtual/rust |
| 41 |
+ ) |
| 42 |
+ elibc_musl? ( |
| 43 |
+ virtual/cargo |
| 44 |
+ virtual/rust |
| 45 |
+ ) |
| 46 |
${RDEPEND}" |
| 47 |
|
| 48 |
RDEPEND+=" |
Archives