commit:     8cfec82893872b61cd42f77b61e034384753dd04
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  7 21:29:30 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jun  7 21:29:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cfec828

app-emulation/qemu: guard fuse depend behind USE=fuse

The change converts automagic FUSE depend for raw block
device export into a USE-guarded flag.

Reported-by: Sam James
Closes: https://bugs.gentoo.org/794820
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-emulation/qemu/metadata.xml      | 1 +
 app-emulation/qemu/qemu-6.0.0.ebuild | 4 +++-
 app-emulation/qemu/qemu-9999.ebuild  | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index ec3f45a0639..37324afea37 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -20,6 +20,7 @@
                <flag name="capstone">Enable disassembly support with 
<pkg>dev-libs/capstone</pkg></flag>
                <flag name="curl">Support ISOs / -cdrom directives via HTTP or 
HTTPS.</flag>
                <flag name="fdt">Enables firmware device tree support</flag>
+               <flag name="fuse">Enables FUSE block device export</flag>
                <flag name="glusterfs">Enables GlusterFS cluster fileystem via
                        <pkg>sys-cluster/glusterfs</pkg></flag>
                <flag name="gnutls">Enable TLS support for the VNC console 
server.

diff --git a/app-emulation/qemu/qemu-6.0.0.ebuild 
b/app-emulation/qemu/qemu-6.0.0.ebuild
index 1a60df4d49b..e9bc9d7b82d 100644
--- a/app-emulation/qemu/qemu-6.0.0.ebuild
+++ b/app-emulation/qemu/qemu-6.0.0.ebuild
@@ -33,7 +33,7 @@ LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 
 IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
-       +fdt glusterfs gnutls gtk infiniband iscsi io-uring
+       +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring
        jack jemalloc +jpeg kernel_linux
        kernel_FreeBSD lzo multipath
        ncurses nfs nls numa opengl +oss +pin-upstream-blobs
@@ -149,6 +149,7 @@ SOFTMMU_TOOLS_DEPEND="
        caps? ( sys-libs/libcap-ng[static-libs(+)] )
        curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
        fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
+       fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
        glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
        gnutls? (
                dev-libs/nettle:=[static-libs(+)]
@@ -504,6 +505,7 @@ qemu_src_configure() {
                $(conf_notuser caps cap-ng)
                $(conf_notuser curl)
                $(conf_notuser fdt)
+               $(conf_notuser fuse)
                $(conf_notuser glusterfs)
                $(conf_notuser gnutls)
                $(conf_notuser gnutls nettle)

diff --git a/app-emulation/qemu/qemu-9999.ebuild 
b/app-emulation/qemu/qemu-9999.ebuild
index b3bbda4c9b8..907f45897b8 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -33,7 +33,7 @@ LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 
 IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
-       +fdt glusterfs gnutls gtk infiniband iscsi io-uring
+       +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring
        jack jemalloc +jpeg kernel_linux
        kernel_FreeBSD lzo multipath
        ncurses nfs nls numa opengl +oss +pin-upstream-blobs
@@ -149,6 +149,7 @@ SOFTMMU_TOOLS_DEPEND="
        caps? ( sys-libs/libcap-ng[static-libs(+)] )
        curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
        fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
+       fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
        glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
        gnutls? (
                dev-libs/nettle:=[static-libs(+)]
@@ -504,6 +505,7 @@ qemu_src_configure() {
                $(conf_notuser caps cap-ng)
                $(conf_notuser curl)
                $(conf_notuser fdt)
+               $(conf_notuser fuse)
                $(conf_notuser glusterfs)
                $(conf_notuser gnutls)
                $(conf_notuser gnutls nettle)

Reply via email to