app-emulation/libvirt: Add use flag iscsi-direct

Since libvirt-4.7, a new storage pool backend iscsi-direct that uses
libiscsi instead of iscsiadm was added. The use flag iscsi-direct will
enable it.

Closes: https://github.com/gentoo/gentoo/pull/10750
Signed-off-by: Han Han <hanhanzhiyeqianke@gmail.com>
Signed-off-by: Matthias Maier <tamiko@gentoo.org>

diff --git a/app-emulation/libvirt/libvirt-4.10.0.ebuild b/app-emulation/libvirt/libvirt-4.10.0.ebuild
index 4ee860eb76cc48ccafe008ffcba9dfa2a7da8b02..72cf7a3a01060e5a754bcd13774760897e0d90ea 100644 (file)
--- a/app-emulation/libvirt/libvirt-4.10.0.ebuild
+++ b/app-emulation/libvirt/libvirt-4.10.0.ebuild
@@ -28,9 +28,9 @@ DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
 LICENSE="LGPL-2.1"
 IUSE="
-       apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
-       libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
-       +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
+       apparmor audit +caps +dbus firewalld fuse glusterfs iscsi iscsi-direct
+       +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp
+       policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
        wireshark-plugins xen zeroconf zfs
 "
 
@@ -81,6 +81,7 @@ RDEPEND="
        fuse? ( >=sys-fs/fuse-2.8.6:= )
        glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
        iscsi? ( sys-block/open-iscsi )
+       iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
        libssh? ( net-libs/libssh )
        lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
        nfs? ( net-fs/nfs-utils )
@@ -257,6 +258,7 @@ src_configure() {
                $(use_with glusterfs)
                $(use_with glusterfs storage-gluster)
                $(use_with iscsi storage-iscsi)
+               $(use_with iscsi-direct storage-iscsi-direct)
                $(use_with libvirtd)
                $(use_with libssh)
                $(use_with lvm storage-lvm)

diff --git a/app-emulation/libvirt/libvirt-4.9.0.ebuild b/app-emulation/libvirt/libvirt-4.9.0.ebuild
index fb60857d3dca7755a5ab06b46b3e76e3867d8e5d..15e0499ef873e3e465de273377e1d0f38e8fbbb5 100644 (file)
--- a/app-emulation/libvirt/libvirt-4.9.0.ebuild
+++ b/app-emulation/libvirt/libvirt-4.9.0.ebuild
@@ -28,9 +28,9 @@ DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
 LICENSE="LGPL-2.1"
 IUSE="
-       apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
-       libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
-       +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
+       apparmor audit +caps +dbus firewalld fuse glusterfs iscsi iscsi-direct
+       +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp
+       policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
        wireshark-plugins xen zeroconf zfs
 "
 
@@ -76,6 +76,7 @@ RDEPEND="
        fuse? ( >=sys-fs/fuse-2.8.6:= )
        glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
        iscsi? ( sys-block/open-iscsi )
+       iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
        libssh? ( net-libs/libssh )
        lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
        nfs? ( net-fs/nfs-utils )
@@ -252,6 +253,7 @@ src_configure() {
                $(use_with glusterfs)
                $(use_with glusterfs storage-gluster)
                $(use_with iscsi storage-iscsi)
+               $(use_with iscsi-direct storage-iscsi-direct)
                $(use_with libvirtd)
                $(use_with libssh)
                $(use_with lvm storage-lvm)

diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 52082872960b86c392eb9c784f70bc9e2175858a..18c56b58956be275b820f70e024663c34cb4cf8b 100644 (file)
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -28,9 +28,9 @@ DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
 LICENSE="LGPL-2.1"
 IUSE="
-       apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
-       libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
-       +qemu rbd sasl selinux +udev +vepa virtualbox virt-network
+       apparmor audit +caps +dbus firewalld fuse glusterfs iscsi iscsi-direct
+       +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp
+       policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network
        wireshark-plugins xen zeroconf zfs
 "
 
@@ -75,6 +75,7 @@ RDEPEND="
        fuse? ( >=sys-fs/fuse-2.8.6:= )
        glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
        iscsi? ( sys-block/open-iscsi )
+       iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
        libssh? ( net-libs/libssh )
        lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
        nfs? ( net-fs/nfs-utils )
@@ -253,6 +254,7 @@ src_configure() {
                $(use_with glusterfs)
                $(use_with glusterfs storage-gluster)
                $(use_with iscsi storage-iscsi)
+               $(use_with iscsi-direct storage-iscsi-direct)
                $(use_with libvirtd)
                $(use_with libssh)
                $(use_with lvm storage-lvm)

diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index 06697bca0c7ebe7492e24af15e5e2a6c369dca2a..63d0a74b30b45ae2cb52763ec8692fed6b919f40 100644 (file)
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -11,6 +11,9 @@
 </maintainer>
 <use>
        <!-- Pool backend flags -->
+       <flag name="iscsi-direct">
+               Allow using libiscsi for iSCSI storage pool backend
+       </flag>
        <flag name="iscsi">
                Allow using an iSCSI remote storage server as pool for disk image storage
        </flag>