diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2018-09-27 16:44:40 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2018-09-27 18:19:07 +0200 |
| commit | 0d7d67562dfc8734534b7df669d06a0caabc4078 (patch) | |
| tree | 8247e51b071dd5a8e99f66d64f58a320c3d42e46 /eclass | |
| parent | mozconfig-v6.60.eclass: Remove dead code (diff) | |
| download | gentoo-0d7d67562dfc8734534b7df669d06a0caabc4078.tar.gz gentoo-0d7d67562dfc8734534b7df669d06a0caabc4078.tar.bz2 gentoo-0d7d67562dfc8734534b7df669d06a0caabc4078.zip | |
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>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/mozconfig-v6.60.eclass | 18 |
1 files changed, 9 insertions, 9 deletions
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+=" |