[gentoo-commits] repo/gentoo:master commit in: x11-terms/alacritty/

[Georgy Yakovlev]

commit:     c9b8dafc4b3a37d843332365b4a17d1f40b93bc4
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 05:08:16 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 05:58:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9b8dafc

x11-terms/alacritty: adjust for cargo_src_configure

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 x11-terms/alacritty/alacritty-0.4.3.ebuild | 9 +++++----
 x11-terms/alacritty/alacritty-0.5.0.ebuild | 9 +++++----
 x11-terms/alacritty/alacritty-9999.ebuild  | 7 ++++---
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/x11-terms/alacritty/alacritty-0.4.3.ebuild 
b/x11-terms/alacritty/alacritty-0.4.3.ebuild
index 6276183c7ed..e3e93f13d66 100644
--- a/x11-terms/alacritty/alacritty-0.4.3.ebuild
+++ b/x11-terms/alacritty/alacritty-0.4.3.ebuild
@@ -328,19 +328,20 @@ src_unpack() {
 }
 
 src_configure() {
-       myfeatures=(
+       local myfeatures=(
                $(usex X x11 '')
                $(usev wayland)
        )
+       cargo_src_configure --no-default-features
 }
 
 src_compile() {
        cd alacritty || die
-       cargo_src_compile ${myfeatures:+--features "${myfeatures[*]}"} 
--no-default-features
+       cargo_src_compile
 }
 
 src_install() {
-       CARGO_INSTALL_PATH="alacritty" cargo_src_install 
${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+       cargo_src_install --path alacritty
 
        newman extra/alacritty.man alacritty.1
 
@@ -368,5 +369,5 @@ src_install() {
 
 src_test() {
        cd alacritty || die
-       cargo_src_test ${myfeatures:+--features "${myfeatures[*]}"} 
--no-default-features
+       cargo_src_test
 }

diff --git a/x11-terms/alacritty/alacritty-0.5.0.ebuild 
b/x11-terms/alacritty/alacritty-0.5.0.ebuild
index c4afa609dd9..87ff44a43d9 100644
--- a/x11-terms/alacritty/alacritty-0.5.0.ebuild
+++ b/x11-terms/alacritty/alacritty-0.5.0.ebuild
@@ -323,19 +323,20 @@ src_unpack() {
 }
 
 src_configure() {
-       myfeatures=(
+       local myfeatures=(
                $(usex X x11 '')
                $(usev wayland)
        )
+       cargo_src_configure --no-default-features
 }
 
 src_compile() {
        cd alacritty || die
-       cargo_src_compile ${myfeatures:+--features "${myfeatures[*]}"} 
--no-default-features
+       cargo_src_compile
 }
 
 src_install() {
-       CARGO_INSTALL_PATH="alacritty" cargo_src_install 
${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+       cargo_src_install --path alacritty
 
        newman extra/alacritty.man alacritty.1
 
@@ -368,5 +369,5 @@ src_install() {
 
 src_test() {
        cd alacritty || die
-       cargo_src_test ${myfeatures:+--features "${myfeatures[*]}"} 
--no-default-features
+       cargo_src_test
 }

diff --git a/x11-terms/alacritty/alacritty-9999.ebuild 
b/x11-terms/alacritty/alacritty-9999.ebuild
index 32b07ae92ac..914851bf7a8 100644
--- a/x11-terms/alacritty/alacritty-9999.ebuild
+++ b/x11-terms/alacritty/alacritty-9999.ebuild
@@ -66,19 +66,20 @@ src_unpack() {
 }
 
 src_configure() {
-       myfeatures=(
+       local myfeatures=(
                $(usex X x11 '')
                $(usev wayland)
        )
+       cargo_src_configure --no-default-features
 }
 
 src_compile() {
        cd alacritty || die
-       cargo_src_compile ${myfeatures:+--features "${myfeatures[*]}"} 
--no-default-features
+       cargo_src_compile
 }
 
 src_install() {
-       CARGO_INSTALL_PATH="alacritty" cargo_src_install 
${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+       cargo_src_install --path alacritty
 
        newman extra/alacritty.man alacritty.1