gentoo resync : 23.09.2020

4 files changed, 17 insertions, 14 deletions

diff --git a/x11-terms/alacritty/Manifest b/x11-terms/alacritty/Manifest
index 4daa40ae0c46..85c9ba4872aa 100644
--- a/x11-terms/alacritty/Manifest
+++ b/x11-terms/alacritty/Manifest
@@ -344,7 +344,7 @@ DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc69104084
 DIST yaml-rust-0.4.4.crate 48359 BLAKE2B 3c504a593663eff6ccdc96b949f2bf5ff9e9030b2cb08dd4bdb6ab2d0409513d4454ae99af4afe69a1dea1d7560454f2eed434cc6ded2c0cbaf9bedea2f3be85 SHA512 63cb5518101a8c841700efa556a14199d136ab390da3b79c9d11a54789e497d0ca0f420bfa31fa75257864beac619d1b28182714c99a8c92f44e333b299d1d6a
 DIST zip-0.5.5.crate 33064 BLAKE2B b10857e79c0548ce0aec9d1d7689e4b9c9d78756c7eaa97462dd201e05877f60fd1bb6f88e9a219bf96063f0716d2246629dac15f802305ea9188d02e61634e5 SHA512 d7f32cba1de57b62546316f3ce81f24dcdf47287555294ca61470d14b61c11f1347c22f2d51df55d351e910720c0b12d1196164964232c9c5fb349ab2630a6ff
 DIST zip-0.5.6.crate 33064 BLAKE2B a14d64b109ddeba3a86b254c6c0ff4b50908d96cfa7b0bc826f292bb7c5e5b58d86c523c1ea630fa93eb9a804e83ba11048ce1cd90c0c0d1d014645d4b47e728 SHA512 e78ccef45715e49228443324057e94046ebd4e0b992f4d91eb680263a7d71aed931d19dd45bf0b18f8a9507a4716cb2f3c7a3888fed0b9a6fba3e65e74125e90
-EBUILD alacritty-0.4.3.ebuild 6874 BLAKE2B a4dee2ce28666b59a8954e5ad34f4bb1a538e3d0ff93dbd67e530a03c0d70dbb8f2ad80be607fe7db84455a10c57fc94d4d36992ed98f0c326b1485cfbbd8341 SHA512 bd2143219108e242c17e88e2e296da057e73404b052b00f7704bfad6b0b53d2608447e91fa8fbc39b94b5e9eb55c2bd04e1de9bd9c9f8c094669e66fbabb7300
-EBUILD alacritty-0.5.0.ebuild 6881 BLAKE2B 889d3c15ffce7ae910e6fae368f80b5ba8331b957a3f3b272d9a85e171204f386ea5b3c6788833dfcd08ae2bd7762837e8179027e0f9308eae021145cf16e001 SHA512 e1a35c76e8c5968e94e2a2b253e0d33a3c650b3832573884727d79b215ecdc41b2e2872e31e4850b6e894038de59d083f0223b0010071ee70f560a90a050139d
-EBUILD alacritty-9999.ebuild 2477 BLAKE2B bfabc060e4ef87f044fc2fd5a4318b952270ab5928c4f4a75935abaa99dc802b7da4a193377992ca86f9e623de0d634aa3a50d2dda28961acee9e2030a1894cb SHA512 32d8e5c352be63d26d6a280e5fb7a69826054c9de1f49bc61bf094bf2b7837cd7016f3c87733390fdb99e3a0191c14e686dbaf183170aa0a76252d2b593c380b
+EBUILD alacritty-0.4.3.ebuild 6708 BLAKE2B c0f5c76517369f8ade3b8a98bb5d888ab061a60eceec72cb44a51f8b1da82164c61fc509f62e7fafeed93a013fc5e64c5f8f1c7c9c3e7b226e23ed273aa7ed18 SHA512 a88669b3973a90ba74fee3649a19341ef88f6a29aa8f342aec8f393de74b67feb4757a4e8506545433cc307f004c1c97440fafb723a4b5cc8ee3ba89671c02e2
+EBUILD alacritty-0.5.0.ebuild 6715 BLAKE2B 6e2093f3ed5d4d913829f5076845bf1c95af2b6620e3dbe7499bb8e1ae528bb4a3d790be26d6976e38a02f9155a4dd5f92bc79f4d67054c84ea4482430ad2ef1 SHA512 08fa348d91377046e9e08a99c6de3697577fc58048f3defe5cdc240a5467aabee31fcdf882c048a0fd6dfe58daf5ebdc40dd36bccb29c49e793045363e82200c
+EBUILD alacritty-9999.ebuild 2378 BLAKE2B d4cded5a354d4291cfef47b86f5df4e55d21535c5475e6d7c38f6c77fb34da47a1e74851730118116248fcd4763e48d73cd7b9f74ac61a6b6b65423f8770b1d6 SHA512 30797640851dc35cd39d50fa438a8393bf621a16154b6a9a2748aac2d89200bf71e5113e250d5674e9e4f20600c0b625af2870bd56c1c4ba6ff9f2529a6d5139
 MISC metadata.xml 818 BLAKE2B c62fb819b5572cc2cfb89ed412cf4edd5c527180997b4cc0a288c413e2f5c04e16f23e72ae6c30ca216bcf33feb20b0b9a762aa4823412b0faa5f2cc7b9fbdbc SHA512 9073045732d5dc09b58766d3c546344216370ca161c9f25bf7f0679913e6fd3816d07de92773df4b5fe3a13b67522f02f2d3cda5b456ddb498e7ca902fe286d1
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