From f625b9919a60a30f1bd860f7d1b2eac183ced593 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 8 Aug 2018 20:11:47 +0100 Subject: gentoo resync : 08.08.2018 --- eclass/cargo.eclass | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'eclass/cargo.eclass') diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass index 799b0618bd25..53efd0e16595 100644 --- a/eclass/cargo.eclass +++ b/eclass/cargo.eclass @@ -11,8 +11,12 @@ if [[ -z ${_CARGO_ECLASS} ]]; then _CARGO_ECLASS=1 +CARGO_DEPEND="" +[[ ${CATEGORY}/${PN} != dev-util/cargo ]] && CARGO_DEPEND="virtual/cargo" + case ${EAPI} in - 6) : ;; + 6) : DEPEND="${DEPEND} ${CARGO_DEPEND}";; + 7) : BDEPEND="${BDEPEND} ${CARGO_DEPEND}";; *) die "EAPI=${EAPI:-0} is not supported" ;; esac @@ -22,8 +26,6 @@ EXPORT_FUNCTIONS src_unpack src_compile src_install IUSE="${IUSE} debug" -[[ ${CATEGORY}/${PN} != dev-util/cargo ]] && DEPEND=">=dev-util/cargo-0.13.0" - ECARGO_HOME="${WORKDIR}/cargo_home" ECARGO_VENDOR="${ECARGO_HOME}/gentoo" @@ -119,7 +121,7 @@ cargo_src_compile() { export CARGO_HOME="${ECARGO_HOME}" - cargo build -v -j $(makeopts_jobs) $(usex debug "" --release) \ + cargo build -j $(makeopts_jobs) $(usex debug "" --release) \ || die "cargo build failed" } -- cgit v1.2.3