From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B79BE138359 for ; Wed, 23 Sep 2020 06:33:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D31F5E0849; Wed, 23 Sep 2020 06:33:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B9604E0849 for ; Wed, 23 Sep 2020 06:33:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A0663340E6D for ; Wed, 23 Sep 2020 06:33:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2BD1A379 for ; Wed, 23 Sep 2020 06:33:31 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1600840733.43d56afaf00b4306dca4aabc0c608aad18cdc795.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/sccache/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/sccache/sccache-0.2.13.ebuild dev-util/sccache/sccache-9999.ebuild X-VCS-Directories: dev-util/sccache/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 43d56afaf00b4306dca4aabc0c608aad18cdc795 X-VCS-Branch: master Date: Wed, 23 Sep 2020 06:33:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d3ea11b7-9c3e-4d1b-b31b-f0acbd9d0c98 X-Archives-Hash: a2df9ee3ebc18b9db9a3c9637f323c44 commit: 43d56afaf00b4306dca4aabc0c608aad18cdc795 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Sep 23 05:09:33 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Sep 23 05:58:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43d56afa dev-util/sccache: adjust for cargo_src_configure Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev gentoo.org> dev-util/sccache/sccache-0.2.13.ebuild | 11 ++--------- dev-util/sccache/sccache-9999.ebuild | 9 +++------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/dev-util/sccache/sccache-0.2.13.ebuild b/dev-util/sccache/sccache-0.2.13.ebuild index 4d2c3f7b831..83a45411fda 100644 --- a/dev-util/sccache/sccache-0.2.13.ebuild +++ b/dev-util/sccache/sccache-0.2.13.ebuild @@ -363,14 +363,11 @@ src_configure() { $(usev redis) $(usev s3) ) -} - -src_compile() { - cargo_src_compile ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features + cargo_src_configure --no-default-features } src_install() { - cargo_src_install ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features + cargo_src_install keepdir /etc/sccache @@ -386,10 +383,6 @@ src_install() { fi } -src_test() { - cargo_src_test ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features -} - pkg_postinst() { ewarn "${PN} is experimental, please use with care" use memcached && optfeature "memcached backend support" net-misc/memcached diff --git a/dev-util/sccache/sccache-9999.ebuild b/dev-util/sccache/sccache-9999.ebuild index ea404f54b9c..8cd33a9a3b1 100644 --- a/dev-util/sccache/sccache-9999.ebuild +++ b/dev-util/sccache/sccache-9999.ebuild @@ -57,14 +57,11 @@ src_configure() { $(usev redis) $(usev s3) ) -} - -src_compile() { - cargo_src_compile ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features + cargo_src_configure --no-default-features } src_install() { - cargo_src_install ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features + cargo_src_install keepdir /etc/sccache @@ -84,7 +81,7 @@ src_test() { if [[ "${PV}" == *9999* ]]; then ewarn "tests are always broken for ${PV} (require network), skipping" else - cargo_src_test ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features + cargo_src_test fi }