app-emulation/virtiofsd: modernise cargo.eclass usage; use bzip2

Addresses some pkgcheck warnings.

Signed-off-by: Sam James <sam@gentoo.org>

3 files changed, 175 insertions, 171 deletions

diff --git a/app-emulation/virtiofsd/Manifest b/app-emulation/virtiofsd/Manifest
index 7902da7ef8f2..9427ead9bea8 100644
--- a/app-emulation/virtiofsd/Manifest
+++ b/app-emulation/virtiofsd/Manifest
@@ -66,7 +66,7 @@ DIST vhost-user-backend-0.8.0.crate 17703 BLAKE2B 9a4c9ab7f5eb1433b70500972ee580
 DIST virtio-bindings-0.1.0.crate 20293 BLAKE2B e511229ae22a53dd9cd1d2aeb235026c139d11ccd2e528eb78848e3586067c027d6f1b7d538276f74548d0949fe60a5d052caeb7f693b3d7d6d8baeb3ab550cd SHA512 ba27ff5790528942b1ed4a20851d426f0a66415970b98957b4bdfc5d3505897874ee9c0242be16d55964799b790f2acd76a1f0c38aa90aff3e3c337584d357ec
 DIST virtio-queue-0.7.0.crate 146031 BLAKE2B 8fb2970e87051787e8891393edb345e3b0045681da5d07d5f75c6695580e57faf172c469a8f14b785c5d622e699613696e3544f8a4d06fa66e58a3546c4c191f SHA512 45891b3411915999d1758b0825699ea07912f83cca5802e56d33023378c268d29d77c3a7b52c0a0828b2256ead0ef6264753db2a78a8f571eb9787b879cc544a
 DIST virtiofsd-v1.5.1.tar.gz 112534 BLAKE2B 52c86ab9d4842ecd496aed3f09a98be96d7ee0eda43a2519eb066be1f648963b155386f9eac1a1c878c12fd05d928f88700c6a7a840c0f34dfa6f86caab15fec SHA512 a50b3fac6d5eafc691ef4fc8808acb4dc03261f01623f6675a234d457231f96181e9cf6c8ac68b4fe1b1c97257faf56bc6d0c2776142c9dbfe82b4e9bde0e34a
-DIST virtiofsd-v1.6.1.tar.gz 115303 BLAKE2B e1fad99baef1a6d2a399107422cfbeede365325d1f2e71e3944bc9db41578320a8c0272550597f05741a171ce4a6426338a3255adabcf948735704f3adc1156b SHA512 ed398c96f16ef520546052bbebe65ae5b4e6818692d4389aa6ace4eb0a9d3cd4b9f3c6b00790b99c4215ceac9eead36a20ae2e18cc8298defb901d9916c241df
+DIST virtiofsd-v1.6.1.tar.bz2 91516 BLAKE2B d0281aec7ff7327a4ea0c36f8cd472fc34ff93516bd657943ee233addbc65f5b3b2c09556e8be215dbe6b0d885b2a9a49eac640958ae0f5c2e6c0908d694ae1f SHA512 62adb94b86ac473c13375d1e4fea037d0ef13ef47b149a831a7c5631cd0d9d7ad9e2f407131c0000caf231a59f6c30c274dfe06d9230979d7c4588c59a9657ca
 DIST vm-memory-0.10.0.crate 68989 BLAKE2B 469a22ecf49d00b44c58b11856db46be02ec7abb783a451ed7f57080989d63d2ce1d66bec3ab8f2b92da8c2e8c685a6d5f652570cff9a48368eca037bc2ed6d9 SHA512 7bdeb565f4bdd6b0df39fb753c97addd18a51b5d788076f60f98cb8d532612a6d41c533f8d3bd3ffcb0304f045fe8b1f69762efdf29f957b27959b6be66420ea
 DIST vmm-sys-util-0.11.1.crate 56848 BLAKE2B c5de8659cfe17914f008e5f74e45929421e2f8cfd9a801a8a5478e7934f94ce299aa91b9951374a6cb9f94a8311f76ae841b87170685e3d5250337da42d6629a SHA512 7395b730bf5e42ca75a73b2d75b2f624958474549c9ee63d4fc63a5a81c51b1e0c370e79d4290b4d6768499498a2941989845d5816c76e3eb1f5b43fdd0c8286
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
diff --git a/app-emulation/virtiofsd/virtiofsd-1.6.1.ebuild b/app-emulation/virtiofsd/virtiofsd-1.6.1.ebuild
index a609ac7791fa..bd8fc8dcbfe7 100644
--- a/app-emulation/virtiofsd/virtiofsd-1.6.1.ebuild
+++ b/app-emulation/virtiofsd/virtiofsd-1.6.1.ebuild
@@ -4,87 +4,87 @@
 EAPI=8
 
 CRATES="
-	aho-corasick-0.7.18
-	ansi_term-0.12.1
-	arc-swap-1.5.0
-	atty-0.2.14
-	autocfg-1.1.0
-	bitflags-1.3.2
-	capng-0.2.2
-	cc-1.0.78
-	cfg-if-1.0.0
-	clap-2.34.0
-	env_logger-0.10.0
-	errno-0.2.8
-	errno-dragonfly-0.1.2
-	error-chain-0.12.4
-	futures-0.3.21
-	futures-channel-0.3.21
-	futures-core-0.3.21
-	futures-executor-0.3.21
-	futures-io-0.3.21
-	futures-macro-0.3.21
-	futures-sink-0.3.21
-	futures-task-0.3.21
-	futures-util-0.3.21
-	heck-0.3.3
-	hermit-abi-0.1.19
-	hermit-abi-0.2.6
-	hostname-0.3.1
-	humantime-2.1.0
-	io-lifetimes-1.0.4
-	is-terminal-0.4.2
-	itoa-1.0.2
-	lazy_static-1.4.0
-	libc-0.2.139
-	libseccomp-sys-0.2.1
-	linux-raw-sys-0.1.4
-	log-0.4.17
-	match_cfg-0.1.0
-	memchr-2.5.0
-	num_cpus-1.13.1
-	num_threads-0.1.6
-	pin-project-lite-0.2.9
-	pin-utils-0.1.0
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro2-1.0.40
-	quote-1.0.20
-	regex-1.6.0
-	regex-syntax-0.6.27
-	rustix-0.36.7
-	slab-0.4.7
-	strsim-0.8.0
-	structopt-0.3.26
-	structopt-derive-0.4.18
-	syn-1.0.98
-	syslog-6.0.1
-	termcolor-1.1.3
-	textwrap-0.11.0
-	time-0.3.11
-	unicode-ident-1.0.2
-	unicode-segmentation-1.9.0
-	unicode-width-0.1.9
-	vec_map-0.8.2
-	version_check-0.9.4
-	vhost-0.6.0
-	vhost-user-backend-0.8.0
-	virtio-bindings-0.1.0
-	virtio-queue-0.7.0
-	vm-memory-0.10.0
-	vmm-sys-util-0.11.1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	windows-sys-0.42.0
-	windows_aarch64_gnullvm-0.42.1
-	windows_aarch64_msvc-0.42.1
-	windows_i686_gnu-0.42.1
-	windows_i686_msvc-0.42.1
-	windows_x86_64_gnu-0.42.1
-	windows_x86_64_gnullvm-0.42.1
-	windows_x86_64_msvc-0.42.1
+	aho-corasick@0.7.18
+	ansi_term@0.12.1
+	arc-swap@1.5.0
+	atty@0.2.14
+	autocfg@1.1.0
+	bitflags@1.3.2
+	capng@0.2.2
+	cc@1.0.78
+	cfg-if@1.0.0
+	clap@2.34.0
+	env_logger@0.10.0
+	errno-dragonfly@0.1.2
+	errno@0.2.8
+	error-chain@0.12.4
+	futures-channel@0.3.21
+	futures-core@0.3.21
+	futures-executor@0.3.21
+	futures-io@0.3.21
+	futures-macro@0.3.21
+	futures-sink@0.3.21
+	futures-task@0.3.21
+	futures-util@0.3.21
+	futures@0.3.21
+	heck@0.3.3
+	hermit-abi@0.1.19
+	hermit-abi@0.2.6
+	hostname@0.3.1
+	humantime@2.1.0
+	io-lifetimes@1.0.4
+	is-terminal@0.4.2
+	itoa@1.0.2
+	lazy_static@1.4.0
+	libc@0.2.139
+	libseccomp-sys@0.2.1
+	linux-raw-sys@0.1.4
+	log@0.4.17
+	match_cfg@0.1.0
+	memchr@2.5.0
+	num_cpus@1.13.1
+	num_threads@0.1.6
+	pin-project-lite@0.2.9
+	pin-utils@0.1.0
+	proc-macro-error-attr@1.0.4
+	proc-macro-error@1.0.4
+	proc-macro2@1.0.40
+	quote@1.0.20
+	regex-syntax@0.6.27
+	regex@1.6.0
+	rustix@0.36.7
+	slab@0.4.7
+	strsim@0.8.0
+	structopt-derive@0.4.18
+	structopt@0.3.26
+	syn@1.0.98
+	syslog@6.0.1
+	termcolor@1.1.3
+	textwrap@0.11.0
+	time@0.3.11
+	unicode-ident@1.0.2
+	unicode-segmentation@1.9.0
+	unicode-width@0.1.9
+	vec_map@0.8.2
+	version_check@0.9.4
+	vhost-user-backend@0.8.0
+	vhost@0.6.0
+	virtio-bindings@0.1.0
+	virtio-queue@0.7.0
+	vm-memory@0.10.0
+	vmm-sys-util@0.11.1
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.5
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.42.0
+	windows_aarch64_gnullvm@0.42.1
+	windows_aarch64_msvc@0.42.1
+	windows_i686_gnu@0.42.1
+	windows_i686_msvc@0.42.1
+	windows_x86_64_gnu@0.42.1
+	windows_x86_64_gnullvm@0.42.1
+	windows_x86_64_msvc@0.42.1
 "
 
 inherit cargo
@@ -92,18 +92,20 @@ inherit cargo
 DESCRIPTION="Shared file system for virtual machines"
 HOMEPAGE="https://virtio-fs.gitlab.io/"
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/virtio-fs/virtiofsd.git"
 	EGIT_BRANCH="main"
 else
-	SRC_URI="https://gitlab.com/virtio-fs/virtiofsd/-/archive/v${PV}/virtiofsd-v${PV}.tar.gz
-			$(cargo_crate_uris ${CRATES})"
+	SRC_URI="https://gitlab.com/virtio-fs/virtiofsd/-/archive/v${PV}/virtiofsd-v${PV}.tar.bz2"
+	SRC_URI+=" ${CARGO_CRATE_URIS}"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016 Unlicense"
+LICENSE="Apache-2.0 BSD"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD MIT Unicode-DFS-2016"
 SLOT="0"
 
 DEPEND="
diff --git a/app-emulation/virtiofsd/virtiofsd-9999.ebuild b/app-emulation/virtiofsd/virtiofsd-9999.ebuild
index a609ac7791fa..bd8fc8dcbfe7 100644
--- a/app-emulation/virtiofsd/virtiofsd-9999.ebuild
+++ b/app-emulation/virtiofsd/virtiofsd-9999.ebuild
@@ -4,87 +4,87 @@
 EAPI=8
 
 CRATES="
-	aho-corasick-0.7.18
-	ansi_term-0.12.1
-	arc-swap-1.5.0
-	atty-0.2.14
-	autocfg-1.1.0
-	bitflags-1.3.2
-	capng-0.2.2
-	cc-1.0.78
-	cfg-if-1.0.0
-	clap-2.34.0
-	env_logger-0.10.0
-	errno-0.2.8
-	errno-dragonfly-0.1.2
-	error-chain-0.12.4
-	futures-0.3.21
-	futures-channel-0.3.21
-	futures-core-0.3.21
-	futures-executor-0.3.21
-	futures-io-0.3.21
-	futures-macro-0.3.21
-	futures-sink-0.3.21
-	futures-task-0.3.21
-	futures-util-0.3.21
-	heck-0.3.3
-	hermit-abi-0.1.19
-	hermit-abi-0.2.6
-	hostname-0.3.1
-	humantime-2.1.0
-	io-lifetimes-1.0.4
-	is-terminal-0.4.2
-	itoa-1.0.2
-	lazy_static-1.4.0
-	libc-0.2.139
-	libseccomp-sys-0.2.1
-	linux-raw-sys-0.1.4
-	log-0.4.17
-	match_cfg-0.1.0
-	memchr-2.5.0
-	num_cpus-1.13.1
-	num_threads-0.1.6
-	pin-project-lite-0.2.9
-	pin-utils-0.1.0
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro2-1.0.40
-	quote-1.0.20
-	regex-1.6.0
-	regex-syntax-0.6.27
-	rustix-0.36.7
-	slab-0.4.7
-	strsim-0.8.0
-	structopt-0.3.26
-	structopt-derive-0.4.18
-	syn-1.0.98
-	syslog-6.0.1
-	termcolor-1.1.3
-	textwrap-0.11.0
-	time-0.3.11
-	unicode-ident-1.0.2
-	unicode-segmentation-1.9.0
-	unicode-width-0.1.9
-	vec_map-0.8.2
-	version_check-0.9.4
-	vhost-0.6.0
-	vhost-user-backend-0.8.0
-	virtio-bindings-0.1.0
-	virtio-queue-0.7.0
-	vm-memory-0.10.0
-	vmm-sys-util-0.11.1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	windows-sys-0.42.0
-	windows_aarch64_gnullvm-0.42.1
-	windows_aarch64_msvc-0.42.1
-	windows_i686_gnu-0.42.1
-	windows_i686_msvc-0.42.1
-	windows_x86_64_gnu-0.42.1
-	windows_x86_64_gnullvm-0.42.1
-	windows_x86_64_msvc-0.42.1
+	aho-corasick@0.7.18
+	ansi_term@0.12.1
+	arc-swap@1.5.0
+	atty@0.2.14
+	autocfg@1.1.0
+	bitflags@1.3.2
+	capng@0.2.2
+	cc@1.0.78
+	cfg-if@1.0.0
+	clap@2.34.0
+	env_logger@0.10.0
+	errno-dragonfly@0.1.2
+	errno@0.2.8
+	error-chain@0.12.4
+	futures-channel@0.3.21
+	futures-core@0.3.21
+	futures-executor@0.3.21
+	futures-io@0.3.21
+	futures-macro@0.3.21
+	futures-sink@0.3.21
+	futures-task@0.3.21
+	futures-util@0.3.21
+	futures@0.3.21
+	heck@0.3.3
+	hermit-abi@0.1.19
+	hermit-abi@0.2.6
+	hostname@0.3.1
+	humantime@2.1.0
+	io-lifetimes@1.0.4
+	is-terminal@0.4.2
+	itoa@1.0.2
+	lazy_static@1.4.0
+	libc@0.2.139
+	libseccomp-sys@0.2.1
+	linux-raw-sys@0.1.4
+	log@0.4.17
+	match_cfg@0.1.0
+	memchr@2.5.0
+	num_cpus@1.13.1
+	num_threads@0.1.6
+	pin-project-lite@0.2.9
+	pin-utils@0.1.0
+	proc-macro-error-attr@1.0.4
+	proc-macro-error@1.0.4
+	proc-macro2@1.0.40
+	quote@1.0.20
+	regex-syntax@0.6.27
+	regex@1.6.0
+	rustix@0.36.7
+	slab@0.4.7
+	strsim@0.8.0
+	structopt-derive@0.4.18
+	structopt@0.3.26
+	syn@1.0.98
+	syslog@6.0.1
+	termcolor@1.1.3
+	textwrap@0.11.0
+	time@0.3.11
+	unicode-ident@1.0.2
+	unicode-segmentation@1.9.0
+	unicode-width@0.1.9
+	vec_map@0.8.2
+	version_check@0.9.4
+	vhost-user-backend@0.8.0
+	vhost@0.6.0
+	virtio-bindings@0.1.0
+	virtio-queue@0.7.0
+	vm-memory@0.10.0
+	vmm-sys-util@0.11.1
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.5
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.42.0
+	windows_aarch64_gnullvm@0.42.1
+	windows_aarch64_msvc@0.42.1
+	windows_i686_gnu@0.42.1
+	windows_i686_msvc@0.42.1
+	windows_x86_64_gnu@0.42.1
+	windows_x86_64_gnullvm@0.42.1
+	windows_x86_64_msvc@0.42.1
 "
 
 inherit cargo
@@ -92,18 +92,20 @@ inherit cargo
 DESCRIPTION="Shared file system for virtual machines"
 HOMEPAGE="https://virtio-fs.gitlab.io/"
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/virtio-fs/virtiofsd.git"
 	EGIT_BRANCH="main"
 else
-	SRC_URI="https://gitlab.com/virtio-fs/virtiofsd/-/archive/v${PV}/virtiofsd-v${PV}.tar.gz
-			$(cargo_crate_uris ${CRATES})"
+	SRC_URI="https://gitlab.com/virtio-fs/virtiofsd/-/archive/v${PV}/virtiofsd-v${PV}.tar.bz2"
+	SRC_URI+=" ${CARGO_CRATE_URIS}"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016 Unlicense"
+LICENSE="Apache-2.0 BSD"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD MIT Unicode-DFS-2016"
 SLOT="0"
 
 DEPEND="