commit: 43d56afaf00b4306dca4aabc0c608aad18cdc795
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 05:09:33 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> 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 <gyakovlev <AT> 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
}