summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2016-10-02 13:14:23 +0200
committerPacho Ramos <pacho@gentoo.org>2016-10-02 14:36:17 +0200
commit6cf3b1da2b88c296f0de93a7dd825e49d06a5223 (patch)
tree35a4ae8e2eda5da1d45f94d53cd15b5a0c8e555f /app-emulation/libvirt
parentdev-ruby/rack: Mark ~hppa ~ppc64 (bug #587756). (diff)
downloadgentoo-6cf3b1da2b88c296f0de93a7dd825e49d06a5223.tar.gz
gentoo-6cf3b1da2b88c296f0de93a7dd825e49d06a5223.tar.bz2
gentoo-6cf3b1da2b88c296f0de93a7dd825e49d06a5223.zip
app-emulation/libvirt: Use zeroconf instead of avahi USE flag (#477620)
Package-Manager: portage-2.3.1
Diffstat (limited to 'app-emulation/libvirt')
-rw-r--r--app-emulation/libvirt/libvirt-2.2.0.ebuild13
1 files changed, 7 insertions, 6 deletions
diff --git a/app-emulation/libvirt/libvirt-2.2.0.ebuild b/app-emulation/libvirt/libvirt-2.2.0.ebuild
index aef26b7a9a6d..245c61b4e6ae 100644
--- a/app-emulation/libvirt/libvirt-2.2.0.ebuild
+++ b/app-emulation/libvirt/libvirt-2.2.0.ebuild
@@ -32,10 +32,10 @@ DESCRIPTION="C toolkit to manipulate virtual machines"
HOMEPAGE="http://www.libvirt.org/"
LICENSE="LGPL-2.1"
IUSE="
- apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm
+ apparmor audit +caps firewalld fuse glusterfs iscsi +libvirtd lvm
lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd
sasl selinux +udev uml +vepa virtualbox virt-network wireshark-plugins
- xen elibc_glibc
+ xen zeroconf elibc_glibc
"
REQUIRED_USE="
@@ -71,7 +71,6 @@ RDEPEND="
sys-libs/readline:=
apparmor? ( sys-libs/libapparmor )
audit? ( sys-process/audit )
- avahi? ( >=net-dns/avahi-0.6[dbus] )
caps? ( sys-libs/libcap-ng )
elibc_glibc? ( sys-libs/glibc[rpc(+)] )
firewalld? ( net-firewall/firewalld )
@@ -114,7 +113,9 @@ RDEPEND="
udev? (
virtual/udev
>=x11-libs/libpciaccess-0.10.9
- )"
+ )
+ zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+"
DEPEND="${RDEPEND}
app-text/xhtml1
@@ -237,7 +238,7 @@ src_prepare() {
# Tweak the init script:
cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
- -e "s/USE_FLAG_AVAHI/$(usex avahi 'use avahi-daemon' '')/" \
+ -e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
-e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
-e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
-i "${S}/libvirtd.init" || die "sed failed"
@@ -251,7 +252,6 @@ src_configure() {
$(use_with apparmor)
$(use_with apparmor apparmor-profiles)
$(use_with audit)
- $(use_with avahi)
$(use_with caps capng)
$(use_with firewalld)
$(use_with fuse)
@@ -284,6 +284,7 @@ src_configure() {
$(use_with xen)
$(use_with xen xen-inotify)
$(usex xen --with-libxl '')
+ $(use_with zeroconf avahi)
--without-hal
--without-netcf