gentoo auto-resync : 03:07:2023 - 04:04:58

4 files changed, 255 insertions, 87 deletions

diff --git a/app-emulation/virtiofsd/Manifest b/app-emulation/virtiofsd/Manifest
index 81c778394100..82847ed6a4e6 100644
--- a/app-emulation/virtiofsd/Manifest
+++ b/app-emulation/virtiofsd/Manifest
@@ -66,6 +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.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
@@ -80,6 +81,7 @@ DIST windows_i686_msvc-0.42.1.crate 722583 BLAKE2B e03978daa0ac95d7bd9f594b28360
 DIST windows_x86_64_gnu-0.42.1.crate 697614 BLAKE2B 3cef0a3da3ce142bbdf932dbb54eb6473070c5722c9ec791dc4077efe2d774d51f8b3d06b3321f8f21cc49764f44d54b3432ee7a0d9376925b422b197f5d557e SHA512 f4c16b587fe407dee1f39df029c52302a0fbd5f519816a8d974fe9c2f928043b14037c701c0f3c9cf2e5c765e82430fd4b71615fe63a66a88159f7b15506f892
 DIST windows_x86_64_gnullvm-0.42.1.crate 362788 BLAKE2B fff81e63b86ad04ce22ad3e05ec4cc02c0b791384c93bafb50832f6db9cb7fd9301ad3845339a08dd8cadac1d59f3e8dc9d5f56d7a987989dbfc16b9131af67b SHA512 8cc988b5995a4726bb7518b7fccff528274ad9b2b0160fe247eb240f9ced10db95afe7bff91bfc5a08ebd8237b6821e4a4abad1ff9da45022f1ce7e7586bcf05
 DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d652a42ee1a60052570527c4e85405f765255375729d4e26287f5246dcad65fa89ccadea23c5135171b311e6da5027e33149c547 SHA512 a651b1a34f101125f929c1d1f5e933691c7a5c19d0bb0c501fb6812236d2771805428e3bd5e05be7d72715595f5fc9e7978dd7934e5d92e9b78a41c2ece695b2
-EBUILD virtiofsd-1.5.1.ebuild 2577 BLAKE2B dd911bec2d213d7b51aab218ecf585c6e975d56fc38e4f2b4bb39f2c6e53bd87ab04c372cf7403b9e288e0de3452ea5f33d714de731f12215bdfed84233d3fb9 SHA512 4d2c0f0b5082d656b736d43dab57c02f0f01ed6cfe09292919e81971fd37588b12c5db4ddac022376e82698e5c9ea60f3c5e7146039488cdb21b76aea047c37e
-EBUILD virtiofsd-9999.ebuild 2577 BLAKE2B dd911bec2d213d7b51aab218ecf585c6e975d56fc38e4f2b4bb39f2c6e53bd87ab04c372cf7403b9e288e0de3452ea5f33d714de731f12215bdfed84233d3fb9 SHA512 4d2c0f0b5082d656b736d43dab57c02f0f01ed6cfe09292919e81971fd37588b12c5db4ddac022376e82698e5c9ea60f3c5e7146039488cdb21b76aea047c37e
+EBUILD virtiofsd-1.5.1-r1.ebuild 3057 BLAKE2B eff80da8e8c05d51102ac71d7cf6006a25214ff8a94ad2f23d9c2c17a320a6d78a48cfbd5c200154a2b0b072bbfec69d025bf82232a5e6f6e55980a0c4810deb SHA512 44fac379d30be91d2e10bd9f9517efe7a2d01440ad5b1840422f761aaa4888bc38da1a2c45eded268f78b45f00f077ed0a933bd8393e1299fe857940515376c0
+EBUILD virtiofsd-1.6.1.ebuild 3071 BLAKE2B 6ebb3d291e85251ad9852de3471f7ff1db72b820aebd1a8e0b749eb5f499a6240fdd5308515a536933da440bd63f0beb0cab5b5522f4360fd56860ba3462f13a SHA512 e2baec3f8b729956625b4c51275b582f96056ea3380a966dfc2daa58280e93a6f087364606d64ccd8de2eedcb952d3007ffd626921110cd6a3264349e77d914b
+EBUILD virtiofsd-9999.ebuild 3071 BLAKE2B 6ebb3d291e85251ad9852de3471f7ff1db72b820aebd1a8e0b749eb5f499a6240fdd5308515a536933da440bd63f0beb0cab5b5522f4360fd56860ba3462f13a SHA512 e2baec3f8b729956625b4c51275b582f96056ea3380a966dfc2daa58280e93a6f087364606d64ccd8de2eedcb952d3007ffd626921110cd6a3264349e77d914b
 MISC metadata.xml 489 BLAKE2B bc6fc4d8ed57fb5a61ea1e2097e8e6deb1ddc302a55d5e5b25995686701c20bffdf066c7d68c84f94aa99ff0bf0551eb8ad44bda627e92741b995c355c28e33c SHA512 db2f4049f8e48b16198cc06c70ce46ca94875590ef82d75d3363fd4ec67de4d5ea35a544f709e466bb8689b9100605439f3207d22f1a06fce7428b1fb706a5c7
diff --git a/app-emulation/virtiofsd/virtiofsd-1.5.1.ebuild b/app-emulation/virtiofsd/virtiofsd-1.5.1-r1.ebuild
index 3352892e3b9a..a609ac7791fa 100644
--- a/app-emulation/virtiofsd/virtiofsd-1.5.1.ebuild
+++ b/app-emulation/virtiofsd/virtiofsd-1.5.1-r1.ebuild
@@ -124,3 +124,15 @@ src_unpack() {
 		cargo_src_unpack
 	fi
 }
+
+src_install() {
+	cargo_src_install
+
+	# Install 50-qemu-virtiofsd.json but to avoid conflicts with
+	# <app-emulation/qemu-8.0.0 install it under different name. In this case,
+	# smaller number means higher priority, but that's probably what users want
+	# anyway if they install this package on top of app-emulation/qemu.
+	# TODO: remove once old QEMUs are removed from the portage.
+	insinto "/usr/share/qemu/vhost-user"
+	newins "50-qemu-virtiofsd.json" "40-qemu-virtiofsd.json"
+}
diff --git a/app-emulation/virtiofsd/virtiofsd-1.6.1.ebuild b/app-emulation/virtiofsd/virtiofsd-1.6.1.ebuild
new file mode 100644
index 000000000000..bd8fc8dcbfe7
--- /dev/null
+++ b/app-emulation/virtiofsd/virtiofsd-1.6.1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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-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
+
+DESCRIPTION="Shared file system for virtual machines"
+HOMEPAGE="https://virtio-fs.gitlab.io/"
+
+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.bz2"
+	SRC_URI+=" ${CARGO_CRATE_URIS}"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+LICENSE="Apache-2.0 BSD"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD MIT Unicode-DFS-2016"
+SLOT="0"
+
+DEPEND="
+	sys-libs/libcap-ng
+	sys-libs/libseccomp
+"
+RDEPEND="${DEPEND}"
+
+# rust does not use *FLAGS from make.conf, silence portage warning
+# update with proper path to binaries this crate installs, omit leading /
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_install() {
+	cargo_src_install
+
+	# Install 50-qemu-virtiofsd.json but to avoid conflicts with
+	# <app-emulation/qemu-8.0.0 install it under different name. In this case,
+	# smaller number means higher priority, but that's probably what users want
+	# anyway if they install this package on top of app-emulation/qemu.
+	# TODO: remove once old QEMUs are removed from the portage.
+	insinto "/usr/share/qemu/vhost-user"
+	newins "50-qemu-virtiofsd.json" "40-qemu-virtiofsd.json"
+}
diff --git a/app-emulation/virtiofsd/virtiofsd-9999.ebuild b/app-emulation/virtiofsd/virtiofsd-9999.ebuild
index 3352892e3b9a..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="
@@ -124,3 +126,15 @@ src_unpack() {
 		cargo_src_unpack
 	fi
 }
+
+src_install() {
+	cargo_src_install
+
+	# Install 50-qemu-virtiofsd.json but to avoid conflicts with
+	# <app-emulation/qemu-8.0.0 install it under different name. In this case,
+	# smaller number means higher priority, but that's probably what users want
+	# anyway if they install this package on top of app-emulation/qemu.
+	# TODO: remove once old QEMUs are removed from the portage.
+	insinto "/usr/share/qemu/vhost-user"
+	newins "50-qemu-virtiofsd.json" "40-qemu-virtiofsd.json"
+}