[gentoo-commits] proj/musl:master commit in: dev-util/cargo/

[Anthony G. Basile]

commit:     5d883c02e17b4c9202fcd7bdbf3695b855d70f7f
Author:     stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Fri Mar  9 12:07:04 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 13:20:13 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=5d883c02

Revert "dev-util/cargo: make the build system honor MAKEOPTS from make.conf"

Fixed in tree via cargo.eclass instead, no need to have it in both and possibly
conflicting.

This reverts commit 16b43a596efd4262efcd5f07ee50da57cb4afc07.

 dev-util/cargo/cargo-0.22.0-r1.ebuild | 4 ++--
 dev-util/cargo/cargo-0.23.0.ebuild    | 4 ++--
 dev-util/cargo/cargo-0.24.0.ebuild    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-util/cargo/cargo-0.22.0-r1.ebuild 
b/dev-util/cargo/cargo-0.22.0-r1.ebuild
index 4c1ff2b..0b10511 100644
--- a/dev-util/cargo/cargo-0.22.0-r1.ebuild
+++ b/dev-util/cargo/cargo-0.22.0-r1.ebuild
@@ -121,7 +121,7 @@ wincolor-0.1.4
 ws2_32-sys-0.2.1
 "
 
-inherit multiprocessing bash-completion-r1 cargo versionator
+inherit bash-completion-r1 cargo versionator
 
 case "${CHOST}" in
        armv7a-hardfloat-*)
@@ -208,7 +208,7 @@ src_configure() {
 src_compile() {
        export CARGO_HOME="${ECARGO_HOME}"
        local 
cargo="${WORKDIR}/cargo-${CARGO_SNAPSHOT_VERSION}-${CARGOHOST}/cargo/bin/cargo"
-       ${cargo} build --release -j$(makeopts_jobs) || die
+       ${cargo} build --release || die
 
        # Building HTML documentation
        use doc && ${cargo} doc

diff --git a/dev-util/cargo/cargo-0.23.0.ebuild 
b/dev-util/cargo/cargo-0.23.0.ebuild
index 21af231..6ac0726 100644
--- a/dev-util/cargo/cargo-0.23.0.ebuild
+++ b/dev-util/cargo/cargo-0.23.0.ebuild
@@ -128,7 +128,7 @@ wincolor-0.1.4
 ws2_32-sys-0.2.1
 "
 
-inherit multiprocessing bash-completion-r1 cargo versionator
+inherit bash-completion-r1 cargo versionator
 
 case "${CHOST}" in
        armv7a-hardfloat-*)
@@ -215,7 +215,7 @@ src_configure() {
 src_compile() {
        export CARGO_HOME="${ECARGO_HOME}"
        local 
cargo="${WORKDIR}/cargo-${CARGO_SNAPSHOT_VERSION}-${CARGOHOST}/cargo/bin/cargo"
-       ${cargo} build --release -j$(makeopts_jobs) || die
+       ${cargo} build --release || die
 
        # Building HTML documentation
        use doc && ${cargo} doc

diff --git a/dev-util/cargo/cargo-0.24.0.ebuild 
b/dev-util/cargo/cargo-0.24.0.ebuild
index b04241b..b1c7978 100644
--- a/dev-util/cargo/cargo-0.24.0.ebuild
+++ b/dev-util/cargo/cargo-0.24.0.ebuild
@@ -132,7 +132,7 @@ wincolor-0.1.4
 ws2_32-sys-0.2.1
 "
 
-inherit multiprocessing bash-completion-r1 cargo versionator
+inherit bash-completion-r1 cargo versionator
 
 case "${CHOST}" in
        armv7a-hardfloat-*)
@@ -217,7 +217,7 @@ src_configure() {
 src_compile() {
        export CARGO_HOME="${ECARGO_HOME}"
        local 
cargo="${WORKDIR}/cargo-${CARGO_SNAPSHOT_VERSION}-${CARGOHOST}/cargo/bin/cargo"
-       ${cargo} build --release -j$(makeopts_jobs) || die
+       ${cargo} build --release || die
 
        # Building HTML documentation
        use doc && ${cargo} doc