From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5AB1D138330 for ; Tue, 4 Oct 2016 07:14:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CEEB0E0AD2; Tue, 4 Oct 2016 07:14:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 98F3FE0AD2 for ; Tue, 4 Oct 2016 07:14:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9966D340FA2 for ; Tue, 4 Oct 2016 07:14:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1ADBE244E for ; Tue, 4 Oct 2016 07:14:51 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1475564538.3361b8c6a77a4221bb40da27bb64ea9cfd6c0f65.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/libvirt-2.0.0-r2.ebuild app-emulation/libvirt/libvirt-2.0.0-r3.ebuild app-emulation/libvirt/libvirt-2.1.0-r1.ebuild app-emulation/libvirt/libvirt-2.1.0-r2.ebuild app-emulation/libvirt/libvirt-2.2.0-r1.ebuild app-emulation/libvirt/libvirt-2.2.0.ebuild app-emulation/libvirt/libvirt-9999.ebuild X-VCS-Directories: app-emulation/libvirt/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 3361b8c6a77a4221bb40da27bb64ea9cfd6c0f65 X-VCS-Branch: master Date: Tue, 4 Oct 2016 07:14:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c465f75a-a0c2-480a-97c5-dc622042ade0 X-Archives-Hash: 33a9d4454b01c2d17d7565eea3ba927f commit: 3361b8c6a77a4221bb40da27bb64ea9cfd6c0f65 Author: Matthias Maier gentoo org> AuthorDate: Tue Oct 4 06:40:59 2016 +0000 Commit: Matthias Maier gentoo org> CommitDate: Tue Oct 4 07:02:18 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3361b8c6 app-emulation/libvirt: rename avahi to zerconf in 2.0.0*, 2.1.0*, 2.2.0*, 9999 Package-Manager: portage-2.3.0 .../{libvirt-2.2.0.ebuild => libvirt-2.0.0-r3.ebuild} | 3 +-- .../{libvirt-2.0.0-r2.ebuild => libvirt-2.1.0-r2.ebuild} | 12 ++++++------ .../{libvirt-2.1.0-r1.ebuild => libvirt-2.2.0-r1.ebuild} | 12 ++++++------ app-emulation/libvirt/libvirt-9999.ebuild | 16 ++++++++-------- 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 similarity index 99% rename from app-emulation/libvirt/libvirt-2.2.0.ebuild rename to app-emulation/libvirt/libvirt-2.0.0-r3.ebuild index 245c61b..44b904e 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 similarity index 97% rename from app-emulation/libvirt/libvirt-2.0.0-r2.ebuild rename to app-emulation/libvirt/libvirt-2.1.0-r2.ebuild index aef26b7..44b904e 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 similarity index 97% rename from app-emulation/libvirt/libvirt-2.1.0-r1.ebuild rename to app-emulation/libvirt/libvirt-2.2.0-r1.ebuild index aef26b7..44b904e 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 6664f6a..055e866 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