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 172E713832E for ; Mon, 8 Aug 2016 04:45:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B015DE0BC7; Mon, 8 Aug 2016 04:45:04 +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 26325E0BCF for ; Mon, 8 Aug 2016 04:45:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 853B2340B29 for ; Mon, 8 Aug 2016 04:45:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9FC18DE for ; Mon, 8 Aug 2016 04:44:59 +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: <1470631481.a62513a728c5fd823dff0bc2ea650f1dd677aaee.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-1.3.5-r2.ebuild app-emulation/libvirt/libvirt-2.0.0-r1.ebuild app-emulation/libvirt/libvirt-2.0.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: a62513a728c5fd823dff0bc2ea650f1dd677aaee X-VCS-Branch: master Date: Mon, 8 Aug 2016 04:44:59 +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: 6c7e996f-9205-4f64-8b32-334bbd6139d0 X-Archives-Hash: 6bd0569273f2175d099eaa68b5219eea commit: a62513a728c5fd823dff0bc2ea650f1dd677aaee Author: Matthias Maier gentoo org> AuthorDate: Mon Aug 8 04:42:03 2016 +0000 Commit: Matthias Maier gentoo org> CommitDate: Mon Aug 8 04:44:41 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a62513a7 app-emulation/libvirt: Fix various dependencies, bug #587708, #590410 Package-Manager: portage-2.2.28 .../{libvirt-2.0.0.ebuild => libvirt-1.3.5-r2.ebuild} | 14 ++++++++------ .../{libvirt-2.0.0.ebuild => libvirt-2.0.0-r1.ebuild} | 7 ++++--- app-emulation/libvirt/libvirt-9999.ebuild | 9 +++++---- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/app-emulation/libvirt/libvirt-2.0.0.ebuild b/app-emulation/libvirt/libvirt-1.3.5-r2.ebuild similarity index 96% copy from app-emulation/libvirt/libvirt-2.0.0.ebuild copy to app-emulation/libvirt/libvirt-1.3.5-r2.ebuild index 1cc40f0..5e8ee7f 100644 --- a/app-emulation/libvirt/libvirt-2.0.0.ebuild +++ b/app-emulation/libvirt/libvirt-1.3.5-r2.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit eutils user autotools-utils linux-info systemd readme.gentoo -BACKPORTS="" +BACKPORTS="20160709" # CVE-2016-5008 if [[ ${PV} = *9999* ]]; then inherit git-r3 @@ -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.xz" + SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.gz" else - SRC_URI="http://libvirt.org/sources/${P}.tar.xz" + SRC_URI="http://libvirt.org/sources/${P}.tar.gz" fi SRC_URI+=" ${BACKPORTS:+ https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz @@ -34,7 +34,7 @@ LICENSE="LGPL-2.1" IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \ lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \ selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \ - xen" + xen elibc_glibc" REQUIRED_USE=" firewalld? ( virt-network ) @@ -71,11 +71,12 @@ RDEPEND=" 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 ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( @@ -85,7 +86,7 @@ RDEPEND=" openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2 + sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) @@ -226,6 +227,7 @@ src_prepare() { "${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch \ "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \ "${FILESDIR}"/${PN}-1.3.1-fix_paths_for_apparmor.patch \ + "${FILESDIR}"/${PN}-1.2.21-avoid_deprecated_pc_file.patch \ "${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch [[ -n ${BACKPORTS} ]] && diff --git a/app-emulation/libvirt/libvirt-2.0.0.ebuild b/app-emulation/libvirt/libvirt-2.0.0-r1.ebuild similarity index 98% rename from app-emulation/libvirt/libvirt-2.0.0.ebuild rename to app-emulation/libvirt/libvirt-2.0.0-r1.ebuild index 1cc40f0..5821930 100644 --- a/app-emulation/libvirt/libvirt-2.0.0.ebuild +++ b/app-emulation/libvirt/libvirt-2.0.0-r1.ebuild @@ -34,7 +34,7 @@ LICENSE="LGPL-2.1" IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \ lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \ selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \ - xen" + xen elibc_glibc" REQUIRED_USE=" firewalld? ( virt-network ) @@ -71,11 +71,12 @@ RDEPEND=" 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 ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( @@ -85,7 +86,7 @@ RDEPEND=" openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2 + sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 04d1596..91ff2e4 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -34,7 +34,7 @@ LICENSE="LGPL-2.1" IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \ lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \ selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \ - xen" + xen elibc_glibc" REQUIRED_USE=" firewalld? ( virt-network ) @@ -71,11 +71,12 @@ RDEPEND=" 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 ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( @@ -85,7 +86,7 @@ RDEPEND=" openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2 + sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 )