app-emulation/libvirt: rename avahi to zerconf in 2.0.0*, 2.1.0*, 2.2.0*, 9999

Package-Manager: portage-2.3.0

4 files changed, 21 insertions, 22 deletions

diff --git a/app-emulation/libvirt/libvirt-2.2.0.ebuild b/app-emulation/libvirt/libvirt-2.0.0-r3.ebuild
index 245c61b4e6ae..44b904eb890d 100644
--- a/app-emulation/libvirt/libvirt-2.2.0.ebuild
+++ b/app-emulation/libvirt/libvirt-2.0.0-r3.ebuild
@@ -114,8 +114,7 @@ RDEPEND="
 		virtual/udev
 		>=x11-libs/libpciaccess-0.10.9
 	)
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-"
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )"
 
 DEPEND="${RDEPEND}
 	app-text/xhtml1
diff --git a/app-emulation/libvirt/libvirt-2.0.0-r2.ebuild b/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild
index aef26b7a9a6d..44b904eb890d 100644
--- a/app-emulation/libvirt/libvirt-2.0.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-2.1.0-r2.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,8 @@ RDEPEND="
 	udev? (
 		virtual/udev
 		>=x11-libs/libpciaccess-0.10.9
-	)"
+	)
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )"
 
 DEPEND="${RDEPEND}
 	app-text/xhtml1
@@ -237,7 +237,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 +251,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 +283,7 @@ src_configure() {
 		$(use_with xen)
 		$(use_with xen xen-inotify)
 		$(usex xen --with-libxl '')
+		$(use_with zeroconf avahi)
 
 		--without-hal
 		--without-netcf
diff --git a/app-emulation/libvirt/libvirt-2.1.0-r1.ebuild b/app-emulation/libvirt/libvirt-2.2.0-r1.ebuild
index aef26b7a9a6d..44b904eb890d 100644
--- a/app-emulation/libvirt/libvirt-2.1.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-2.2.0-r1.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,8 @@ RDEPEND="
 	udev? (
 		virtual/udev
 		>=x11-libs/libpciaccess-0.10.9
-	)"
+	)
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )"
 
 DEPEND="${RDEPEND}
 	app-text/xhtml1
@@ -237,7 +237,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 +251,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 +283,7 @@ src_configure() {
 		$(use_with xen)
 		$(use_with xen xen-inotify)
 		$(usex xen --with-libxl '')
+		$(use_with zeroconf avahi)
 
 		--without-hal
 		--without-netcf
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 6664f6a487e8..055e8660d7b0 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -17,9 +17,9 @@ if [[ ${PV} = *9999* ]]; then
 else
 	# Versions with 4 numbers are stable updates:
 	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
-		SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.gz"
+		SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz"
 	else
-		SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
+		SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
 	fi
 	SRC_URI+=" ${BACKPORTS:+
 		https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
@@ -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,8 @@ RDEPEND="
 	udev? (
 		virtual/udev
 		>=x11-libs/libpciaccess-0.10.9
-	)"
+	)
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )"
 
 DEPEND="${RDEPEND}
 	app-text/xhtml1
@@ -237,7 +237,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 +251,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 +283,7 @@ src_configure() {
 		$(use_with xen)
 		$(use_with xen xen-inotify)
 		$(usex xen --with-libxl '')
+		$(use_with zeroconf avahi)
 
 		--without-hal
 		--without-netcf