commit: 842a4dfd703d8359b6fab9853cf9f9e7e8c8ef50 Author: Marcus Comstedt <marcus <AT> mc <DOT> pp <DOT> se> AuthorDate: Sun Oct 28 21:28:56 2018 +0000 Commit: Dirkjan Ochtman <djc <AT> gentoo <DOT> org> CommitDate: Sun Oct 28 21:30:00 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=842a4dfd
dev-util/cargo: use rust-toolchain.eclass to simply keywording Signed-off-by: Marcus Comstedt <marcus <AT> mc.pp.se> Signed-off-by: Dirkjan Ochtman <djc <AT> gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 dev-util/cargo/Manifest | 7 +++++++ dev-util/cargo/cargo-0.30.0.ebuild | 33 +++------------------------------ 2 files changed, 10 insertions(+), 30 deletions(-) diff --git a/dev-util/cargo/Manifest b/dev-util/cargo/Manifest index 0a48888e766..68416d69f4d 100644 --- a/dev-util/cargo/Manifest +++ b/dev-util/cargo/Manifest @@ -11,6 +11,13 @@ DIST cargo-0.29.0-arm-unknown-linux-gnueabi.tar.xz 4716672 BLAKE2B f14d8091c4ef3 DIST cargo-0.29.0-arm-unknown-linux-gnueabihf.tar.xz 4754612 BLAKE2B 880f97d7081138946c090936171767b8aaa82f5c07f25c53c00572427ccda29d14279cc7209c08891b34787854169185fa1aca89dfe91384002e7672fb585199 SHA512 7675251e5ea163e23e27501ba6e534b5d79a4eb3d411604f42b31f604c21d491ecad77ae40552738ce9c05e630ebf162c47827e9c4c36c3cf960b1e3f3ace2d0 DIST cargo-0.29.0-armv7-unknown-linux-gnueabihf.tar.xz 4748580 BLAKE2B 3528f3e7412d6562d2551148ba8945cd70de4bb1565fdb184a4aba3d44fee4dae6edeb150a38a70ac4b8fabd056d366e4a3ce68dd20e9cae123362b2a6f48b39 SHA512 db6cb3252b484006c51cfefc0fc6adad04bb29e71892323965072e9b3e2441a760fe268fc46c9272318b7ff60834b41bc0843592371c029ea07dd744be6a1489 DIST cargo-0.29.0-i686-unknown-linux-gnu.tar.xz 4996976 BLAKE2B 6bc94fcb274ee97bee3f17213f5afef7a7d92276e1865e0648806ea4b8aac663561fc36826ac8f38abf43ee71b0be8f9d3688d759cf638628e3004bf96bf23a6 SHA512 a9d1ad33c1aec30d39354bbafc3976cf6410bc03fd77a6e98c95af39280b9f2a579817429c933e31eaa19170e11a0dfb33147262d04183b9b714d58be8f93b32 +DIST cargo-0.29.0-mips-unknown-linux-gnu.tar.xz 4251332 BLAKE2B 92bc697cf151764f553d920ee14ee76b717d33301cdb21344873c1b4930e1f0aa60c6089ece51f8843862e0708ead037d9d4c809f0bd5e94034797090d38a577 SHA512 29398e82d9a44dc300fa69e936ae2b2c5865ad670cfcfdf8a3c943121b16c98f83ead4c4ac14f8f4a9b84bc1823e38dd9aaddd70341e7971573762541c2862f5 +DIST cargo-0.29.0-mips64-unknown-linux-gnuabi64.tar.xz 4183044 BLAKE2B e323ba93f2491d8adec772bba83d8485fe367f888c150fef0b231e336ad9b1940b211dd3c53b88cb25057909738554ff51d39a571ddc96d8c5013fbc946d9e60 SHA512 8e8577dc78d4deead9f40c45502fb16533fefe99df869313b174bda9d8b6b1c2d93e161420777449850bc494623193fe7163234fc5ba28307a2df767a8902c49 +DIST cargo-0.29.0-mipsel-unknown-linux-gnu.tar.xz 4353112 BLAKE2B 8e182f45c23851a77d8c4d789b37057e047700a3575306dd189d6f538ec7b478f14330fde21cb6d508fe3e28b665373f211de8b755e5a127db86e8afc3a0e63c SHA512 f7ed870885087086f0445c63e333cdf98a6a5e3750c88e2aa9075041e9df874bd188eb378f2627dc198a1a33c4b66118c5f479d1246a4290e870a140e5263820 +DIST cargo-0.29.0-powerpc-unknown-linux-gnu.tar.xz 4287000 BLAKE2B 67d66ec85dbbdbdf52c58469822a00a5e7174d4f2320c76eb6bd3554f5f5b296e9a3b86fd3683bf1d899be09b26f322f019237bdd5facaf91fad876a9f92f93e SHA512 33fd864771a4d144223396d5af3e16d0ead7c50e6c9ed7602a320d5df505d787dca4f792fd7399fe0718a2a4c9d97cf086f1840d20815390ed0e21b21ea32a14 +DIST cargo-0.29.0-powerpc64-unknown-linux-gnu.tar.xz 4361184 BLAKE2B ac9abd7223aec898b32c02f8ef809021f22d81833284e4ecec473cad5dc6e5f09b60f39ce09be75f832f49399988761cc3894ee7d2d7eaf1f53efd449bbe1db0 SHA512 076177de8ac4eb6eeb467d736622b1221d014f2fe3e042d75a6689a12886b65d1cccb8fdc4ea1cc47f1249bfd30335e6744e01d49c907449170221a641c680e7 +DIST cargo-0.29.0-powerpc64le-unknown-linux-gnu.tar.xz 4603700 BLAKE2B e0e1c9104c4b026bc9571966f9cd4c6044c8716f7eee621192171d08cccd53f6cbde7f1ce37d6b95a324516e22a9c36d864e0207f9e8b8e4684cd9fcd04e1e8c SHA512 702752a015a09c6b61f08a46aa616290d0eaa0c5342ad73238a44a15fd66ae749b14a31052d53d679ba582a357dbba9c50b690ec04e0be805bc4755cde52c9b5 +DIST cargo-0.29.0-s390x-unknown-linux-gnu.tar.xz 4111676 BLAKE2B e43046f2d036d2243e922569c284fbdd56e7f8a8e2c4c3e42a83e1adb4d7aa098b1919c39c23e84a9d3313218ce670cd8de66da5af77c6e0da075138ff58e65b SHA512 cff62105c5ea4bc3314317999a66019a09d4acdd2409e9e140262023ce53e8b0d488c7e20f9d1ca518cb7fbd62ed2dbd7c9af25e3458d12f30e2bc493fd021ff DIST cargo-0.29.0-x86_64-unknown-linux-gnu.tar.xz 4916092 BLAKE2B 0e0816886ef2b5cbfe8e639482b866c634917e1942aad457b69d14ca5ad15c3f655361c271277645b8f485f00fe0b6255a4423c8f45620cba70f0a622c93885e SHA512 f27e1b2cf212b2bfbaff0eca787e5cdb56389504f8e5ecd737a49db977e0c20a54cd2f504b9f6cfebe14bb6880e375ad03db0f1e5dcddd3278590332e9343e76 DIST cargo-0.30.0.crate 797689 BLAKE2B 4d141fda6fc2ba340a4781cff45bb6becba0a97e63cd2993378ecb5698c44a92c720b67771e2de289aff18e698e43c9dfa0233d14cadbf936a2681dadafe1e65 SHA512 7d6f99710fa7a68de0a36c7f79fee5c1281f626822faa193f2e9c777dafb992cd62dfaa02fab0f274837dd13849b1725a9d8b1f18729062d33cd01f5ffb845af DIST cargo-0.30.0.tar.gz 805226 BLAKE2B 325a8cffb0a2b46f84cdb706972cd6c395491b789a6de47c50d1da61e51471b1667efaa3130705e4973d3cda12b3ce9b5752a6bc5a22d5910baae29b5684b183 SHA512 c9e79b6cab06775affc855180e02c503e08e7329240881dfb3677b9bcc8b7d5be5417a04a02ed230980e81676d4d21db551813fd3ce3351da42cb4f7b15637e1 diff --git a/dev-util/cargo/cargo-0.30.0.ebuild b/dev-util/cargo/cargo-0.30.0.ebuild index 2ffebd002c9..3ab88c1f333 100644 --- a/dev-util/cargo/cargo-0.30.0.ebuild +++ b/dev-util/cargo/cargo-0.30.0.ebuild @@ -139,7 +139,7 @@ winapi-x86_64-pc-windows-gnu-0.4.0 wincolor-1.0.1 " -inherit cargo bash-completion-r1 multiprocessing versionator +inherit cargo bash-completion-r1 multiprocessing versionator rust-toolchain BOOTSTRAP_VERSION="0.$(($(get_version_component_range 2) - 1)).0" @@ -147,20 +147,7 @@ DESCRIPTION="The Rust's package manager" HOMEPAGE="http://crates.io"; SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz $(cargo_crate_uris ${CRATES}) - x86? ( - https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-i686-unknown-linux-gnu.tar.xz - ) - amd64? ( - https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.xz - ) - arm? ( - https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabi.tar.xz - https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabihf.tar.xz - https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-armv7-unknown-linux-gnueabihf.tar.xz - ) - arm64? ( - https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-aarch64-unknown-linux-gnu.tar.xz - )" + $(rust_all_arch_uris cargo-${BOOTSTRAP_VERSION})" RESTRICT="mirror" LICENSE="|| ( MIT Apache-2.0 )" @@ -169,20 +156,6 @@ KEYWORDS="amd64 ~arm64 x86" IUSE="doc libressl" -if [[ ${ARCH} = "amd64" ]]; then - TRIPLE="x86_64-unknown-linux-gnu" -elif [[ ${ARCH} = "x86" ]]; then - TRIPLE="i686-unknown-linux-gnu" -elif [[ ${ARCH} = "arm64" ]]; then - TRIPLE="aarch64-unknown-linux-gnu" -elif [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then - TRIPLE="arm-unknown-linux-gnueabi" -elif [[ ${CHOST} == armv6*h* ]]; then - TRIPLE="arm-unknown-linux-gnueabihf" -elif [[ ${CHOST} == armv7*h* ]]; then - TRIPLE="armv7-unknown-linux-gnueabihf" -fi - COMMON_DEPEND="sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) @@ -208,7 +181,7 @@ src_configure() { src_compile() { export CARGO_HOME="${ECARGO_HOME}" - local cargo="${WORKDIR}/cargo-${BOOTSTRAP_VERSION}-${TRIPLE}/cargo/bin/cargo" + local cargo="${WORKDIR}/cargo-${BOOTSTRAP_VERSION}-$(rust_abi)/cargo/bin/cargo" ${cargo} build -j$(makeopts_jobs) --release || die # Building HTML documentation
