app-emulation/libvirt: avoid automagic dbus dependency, bug #597604

Do this by introducing a dbus use flag to control the configure option.

Package-Manager: Portage-2.3.0, Repoman-2.3.1

diff --git a/app-emulation/libvirt/libvirt-2.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-2.5.0-r2.ebuild
similarity index 96%
rename from app-emulation/libvirt/libvirt-2.5.0-r1.ebuild
rename to app-emulation/libvirt/libvirt-2.5.0-r2.ebuild
index d4fb5455a377f4484f16963114a86350fad18024..edc6c59f2b1b6b0dae7e5bf052c0dc23965d812f 100644 (file)
--- a/app-emulation/libvirt/libvirt-2.5.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-2.5.0-r2.ebuild
@@ -27,10 +27,10 @@ DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
 LICENSE="LGPL-2.1"
 IUSE="
-       apparmor audit +caps 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 wireshark-plugins
-       xen zeroconf zfs elibc_glibc
+       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
+       wireshark-plugins xen zeroconf zfs elibc_glibc
 "
 
 REQUIRED_USE="
@@ -38,6 +38,7 @@ REQUIRED_USE="
        libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
        lxc? ( caps libvirtd )
        openvz? ( libvirtd )
+       policykit? ( dbus )
        qemu? ( libvirtd )
        uml? ( libvirtd )
        vepa? ( macvtap )
@@ -67,6 +68,7 @@ RDEPEND="
        apparmor? ( sys-libs/libapparmor )
        audit? ( sys-process/audit )
        caps? ( sys-libs/libcap-ng )
+       dbus? ( sys-apps/dbus )
        elibc_glibc? ( sys-libs/glibc[rpc(+)] )
        firewalld? ( net-firewall/firewalld )
        fuse? ( >=sys-fs/fuse-2.8.6 )
@@ -246,6 +248,7 @@ src_configure() {
                $(use_with apparmor apparmor-profiles)
                $(use_with audit)
                $(use_with caps capng)
+               $(use_with dbus)
                $(use_with firewalld)
                $(use_with fuse)
                $(use_with glusterfs)

diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 63d636d875373e8dd785f13d2742acd6698f183a..609bf97449e2ba33fce6e5dc98cb4e0988f22957 100644 (file)
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -27,10 +27,10 @@ DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
 LICENSE="LGPL-2.1"
 IUSE="
-       apparmor audit +caps 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 wireshark-plugins
-       xen zeroconf zfs elibc_glibc
+       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
+       wireshark-plugins xen zeroconf zfs elibc_glibc
 "
 
 REQUIRED_USE="
@@ -38,6 +38,7 @@ REQUIRED_USE="
        libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
        lxc? ( caps libvirtd )
        openvz? ( libvirtd )
+       policykit? ( dbus )
        qemu? ( libvirtd )
        uml? ( libvirtd )
        vepa? ( macvtap )
@@ -67,6 +68,7 @@ RDEPEND="
        apparmor? ( sys-libs/libapparmor )
        audit? ( sys-process/audit )
        caps? ( sys-libs/libcap-ng )
+       dbus? ( sys-apps/dbus )
        elibc_glibc? ( sys-libs/glibc[rpc(+)] )
        firewalld? ( net-firewall/firewalld )
        fuse? ( >=sys-fs/fuse-2.8.6 )
@@ -246,6 +248,7 @@ src_configure() {
                $(use_with apparmor apparmor-profiles)
                $(use_with audit)
                $(use_with caps capng)
+               $(use_with dbus)
                $(use_with firewalld)
                $(use_with fuse)
                $(use_with glusterfs)