commit: 0d8bd2a7b215263e5f61c2d00734eea4e9b0be6b Author: Michal Privoznik <michal.privoznik <AT> gmail <DOT> com> AuthorDate: Sun Dec 17 19:00:02 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jan 26 07:49:33 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d8bd2a7
app-emulation/virtiofsd: Update live ebuild Update list of crates and subsequently used licenses. Also, upstream renamed the 50-qemu-virtiofsd.json to just 50-virtiofsd.json. While we no longer clash with the file installed by app-emulation/qemu, continue installing it under a different name so that libvirt prioritizes the virtiofsd installed by app-emulation/virtiofsd over the one installed by app-emulation/qemu. Signed-off-by: Michal Privoznik <michal.privoznik <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> app-emulation/virtiofsd/virtiofsd-9999.ebuild | 93 ++++++++++++++------------- 1 file changed, 49 insertions(+), 44 deletions(-) diff --git a/app-emulation/virtiofsd/virtiofsd-9999.ebuild b/app-emulation/virtiofsd/virtiofsd-9999.ebuild index 9135808fa5d6..09af40b3e237 100644 --- a/app-emulation/virtiofsd/virtiofsd-9999.ebuild +++ b/app-emulation/virtiofsd/virtiofsd-9999.ebuild @@ -5,19 +5,29 @@ EAPI=8 CRATES=" aho-corasick@0.7.18 - ansi_term@0.12.1 + anstream@0.3.2 + anstyle@1.0.1 + anstyle-parse@0.2.1 + anstyle-query@1.0.0 + anstyle-wincon@1.0.1 arc-swap@1.5.0 atty@0.2.14 autocfg@1.1.0 bitflags@1.3.2 + bitflags@2.4.1 capng@0.2.2 - cc@1.0.78 + cc@1.0.79 cfg-if@1.0.0 - clap@2.34.0 - env_logger@0.10.0 + clap@4.3.11 + clap_builder@4.3.11 + clap_derive@4.3.2 + clap_lex@0.5.0 + colorchoice@1.0.0 + env_logger@0.8.4 + errno@0.3.1 errno-dragonfly@0.1.2 - errno@0.2.8 error-chain@0.12.4 + futures@0.3.21 futures-channel@0.3.21 futures-core@0.3.21 futures-executor@0.3.21 @@ -26,65 +36,60 @@ CRATES=" futures-sink@0.3.21 futures-task@0.3.21 futures-util@0.3.21 - futures@0.3.21 - heck@0.3.3 + heck@0.4.1 hermit-abi@0.1.19 - hermit-abi@0.2.6 + hermit-abi@0.3.2 hostname@0.3.1 humantime@2.1.0 - io-lifetimes@1.0.4 - is-terminal@0.4.2 + is-terminal@0.4.9 itoa@1.0.2 - lazy_static@1.4.0 - libc@0.2.139 + libc@0.2.147 libseccomp-sys@0.2.1 - linux-raw-sys@0.1.4 + linux-raw-sys@0.4.5 log@0.4.17 match_cfg@0.1.0 memchr@2.5.0 num_cpus@1.13.1 num_threads@0.1.6 + once_cell@1.18.0 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 + proc-macro2@1.0.63 + quote@1.0.29 regex@1.6.0 - rustix@0.36.7 + regex-syntax@0.6.27 + rustix@0.38.7 slab@0.4.7 - strsim@0.8.0 - structopt-derive@0.4.18 - structopt@0.3.26 + strsim@0.10.0 syn@1.0.98 + syn@2.0.23 syslog@6.0.1 termcolor@1.1.3 - textwrap@0.11.0 + thiserror@1.0.41 + thiserror-impl@1.0.41 time@0.3.11 unicode-ident@1.0.2 - unicode-segmentation@1.9.0 - unicode-width@0.1.9 - vec_map@0.8.2 + utf8parse@0.2.1 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 + vhost@0.10.0 + vhost-user-backend@0.13.1 + virtio-bindings@0.2.2 + virtio-queue@0.11.0 + vm-memory@0.14.0 + vmm-sys-util@0.12.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 - 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 + windows-sys@0.48.0 + windows-targets@0.48.1 + windows_aarch64_gnullvm@0.48.0 + windows_aarch64_msvc@0.48.0 + windows_i686_gnu@0.48.0 + windows_i686_msvc@0.48.0 + windows_x86_64_gnu@0.48.0 + windows_x86_64_gnullvm@0.48.0 + windows_x86_64_msvc@0.48.0 " inherit cargo @@ -105,7 +110,7 @@ fi LICENSE="Apache-2.0 BSD" # Dependent crate licenses -LICENSE+=" Apache-2.0 BSD MIT Unicode-DFS-2016" +LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016 Unlicense" SLOT="0" DEPEND=" @@ -133,11 +138,11 @@ src_install() { mkdir "${ED}/usr/libexec" || die mv "${ED}/usr/"{bin,libexec}/${PN} || die - # Install 50-qemu-virtiofsd.json but to avoid conflicts with + # Install 50-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" + newins "50-virtiofsd.json" "40-virtiofsd.json" }