app-emulation/libvirt: Add virtiofsd USE flag

While technically app-emulation/virtiofsd is not a libvirt
dependency (app-emulation/qemu and app-emulation/virtiofsd can
function on their own, happily), it's handy (in some scenarios)
to drag it automatically in as a dependency. Invent "virtiofsd"
USE flag that controls this.

Bug: https://bugs.gentoo.org/913212
Signed-off-by: Michal Privoznik <michal.privoznik@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>

7 files changed, 21 insertions, 3 deletions

diff --git a/app-emulation/libvirt/libvirt-10.0.0.ebuild b/app-emulation/libvirt/libvirt-10.0.0.ebuild
index fcb80d5cb161..25ba088988c0 100644
--- a/app-emulation/libvirt/libvirt-10.0.0.ebuild
+++ b/app-emulation/libvirt/libvirt-10.0.0.ebuild
@@ -32,7 +32,7 @@ IUSE="
 	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
 	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
 	openvz parted pcap policykit +qemu rbd sasl selinux test +udev
-	virtualbox +virt-network wireshark-plugins xen zfs
+	virtiofsd virtualbox +virt-network wireshark-plugins xen zfs
 "
 RESTRICT="!test? ( test )"
 
@@ -120,6 +120,7 @@ RDEPEND="
 		net-misc/radvd
 		sys-apps/iproute2[-minimal]
 	)
+	virtiofsd? ( app-emulation/virtiofsd )
 	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
 	xen? (
 		>=app-emulation/xen-4.9.0
diff --git a/app-emulation/libvirt/libvirt-9.9.0.ebuild b/app-emulation/libvirt/libvirt-9.9.0.ebuild
index 04bcd4cb2322..cc922f97df11 100644
--- a/app-emulation/libvirt/libvirt-9.9.0.ebuild
+++ b/app-emulation/libvirt/libvirt-9.9.0.ebuild
@@ -31,7 +31,7 @@ SLOT="0/${PV}"
 IUSE="
 	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
 	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
-	parted pcap policykit +qemu rbd sasl selinux test +udev
+	parted pcap policykit +qemu rbd sasl selinux test +udev virtiofsd
 	virtualbox +virt-network wireshark-plugins xen zfs
 "
 RESTRICT="!test? ( test )"
@@ -120,6 +120,7 @@ RDEPEND="
 		net-misc/radvd
 		sys-apps/iproute2[-minimal]
 	)
+	virtiofsd? ( app-emulation/virtiofsd )
 	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
 	xen? (
 		>=app-emulation/xen-4.9.0
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index c61085b4b439..38baa163aaa0 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -32,7 +32,7 @@ IUSE="
 	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
 	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
 	openvz parted pcap policykit +qemu rbd sasl selinux test +udev
-	virtualbox +virt-network wireshark-plugins xen zfs
+	virtiofsd virtualbox +virt-network wireshark-plugins xen zfs
 "
 RESTRICT="!test? ( test )"
 
@@ -120,6 +120,7 @@ RDEPEND="
 		net-misc/radvd
 		sys-apps/iproute2[-minimal]
 	)
+	virtiofsd? ( app-emulation/virtiofsd )
 	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
 	xen? (
 		>=app-emulation/xen-4.9.0
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index e8819dedc86a..16610185fea3 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -96,6 +96,9 @@
 		<flag name="zfs">
 			Enable ZFS backend storage <pkg>sys-fs/zfs</pkg>
 		</flag>
+		<flag name="virtiofsd">
+			Drag in virtiofsd dependency <pkg>app-emulation/virtiofsd</pkg>
+		</flag>
 	</use>
 	<upstream>
 		<remote-id type="gitlab">libvirt/libvirt</remote-id>
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 9ac5e1dc4690..6631c085ccd3 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -518,3 +518,7 @@ media-sound/mpg123-base cpu_flags_x86_mmx cpu_flags_x86_3dnow cpu_flags_x86_3dno
 # saves people from needlessly installing nasm
 # Refs bug #93279
 media-sound/lame cpu_flags_x86_mmx
+
+# Michal Privoznik <michal.privoznik@gmail.com> (2024-01-21)
+# virtiofsd is available here
+app-emulation/libvirt -virtiofsd
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index ed5692624192..6f38b5955657 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -457,3 +457,7 @@ dev-libs/libcec raspberry-pi
 # Andreas Sturmlechner <asturm@gentoo.org> (2023-03-09)
 # media-libs/libplacebo is not keyworded anywhere except amd64/ppc64/x86 yet
 media-video/ffmpeg libplacebo
+
+# Michal Privoznik <michal.privoznik@gmail.com> (2024-01-21)
+# virtiofsd is only available on some arches
+app-emulation/libvirt virtiofsd
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index c1d907fe1c86..0754fb7098d6 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -228,3 +228,7 @@ net-im/pidgin gstreamer
 
 # mask custom-cpuopts and cpudetection on ppc64 for mplayer - bug #234629
 media-video/mplayer cpudetection
+
+# Michal Privoznik <michal.privoznik@gmail.com> (2024-01-21)
+# virtiofsd is available here
+app-emulation/libvirt -virtiofsd