From c9b8dafc4b3a37d843332365b4a17d1f40b93bc4 Mon Sep 17 00:00:00 2001
From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Tue, 22 Sep 2020 22:08:16 -0700
Subject: x11-terms/alacritty: adjust for cargo_src_configure

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev@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(-)

(limited to 'x11-terms')

diff --git a/x11-terms/alacritty/alacritty-0.4.3.ebuild b/x11-terms/alacritty/alacritty-0.4.3.ebuild
index 6276183c7ed8..e3e93f13d662 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 c4afa609dd9a..87ff44a43d9e 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 32b07ae92ac8..914851bf7a89 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
 
-- 
cgit v1.2.3-65-gdbad