Update the live ebuild with the fixes from recent releases.

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xD7DFA8D318FA9AEF!

3 files changed, 46 insertions, 30 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 1f9d9bdfa954..aab8ee61525b 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.260 2013/03/20 19:10:06 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.261 2013/03/23 20:30:09 cardoe Exp $
+
+  23 Mar 2013; Doug Goldstein <cardoe@gentoo.org> libvirt-9999.ebuild:
+  Update the live ebuild with the fixes from recent releases.
 
   20 Mar 2013; Doug Goldstein <cardoe@gentoo.org> libvirt-1.0.3-r2.ebuild:
   Fix issue with location of sysctl.d file being installed to the correct path.
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 9bb2244abd5e..3967a1a393d6 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -14,19 +14,19 @@ EBUILD libvirt-1.0.0.ebuild 11574 SHA256 1277354f747515fda62740224ff1d8dd967640d
 EBUILD libvirt-1.0.2-r2.ebuild 11904 SHA256 e23eab142c43e637887624cb7a4ac938628e2cc7b91334aae5dab6f79b45b0ee SHA512 10b89f40ea02f331edc37e224bcc9b82475b1a8a94dc4abef6f76a9576c16b4d23d0beb29f3b96577d16b60010cb73afa747cd69d35b6cdf4610acf09f338757 WHIRLPOOL c62d046708d2e389aff31ebfc779eb670a9dfa30bf04161a118b09a6623e2376d15c0d2df05f99a296fa1c5f762771426e26efd57e159f2801d019e44a1d9b38
 EBUILD libvirt-1.0.3-r1.ebuild 11906 SHA256 8ad34603ca9f08a668c10a5b02fdad4b539fe497ab8f488e11c7072a5edc8263 SHA512 16361396f9584de6f5df6f8b6c8c616aaf61bcc256649f9fff8d9d5a1197dad37cbb68db8d072b7b6ae48693fc19b49e2339b4636f5a998c35e1cd54b5d888d2 WHIRLPOOL 5dbfc30285a7b243ff24e01535114bc35ab1b459a6ab246726bc9f923c0a745e3108c0484bd424167b184ae8b48d682a30eceb0b2f370328b9bd556b977237d6
 EBUILD libvirt-1.0.3-r2.ebuild 11910 SHA256 fab604a30f2a525db79439beacc89b990213cbbf43e031bb10d00f58838a1206 SHA512 92666c1eeb93ed21dc71f22c3ac11e255504e7580efd0a74930b6e7bd35abba84fafe7989a140b68313445f6141b779b5190ff59e368444ac12ea881b2288ffe WHIRLPOOL 75def1c72897507250efc7aafb7eefa142c5fc4e78b34672cd4dd89e51fa896f109b441566d7c7f2ea7ef65b4fbac006390808e9ccbc19a5d6612d626aa47039
-EBUILD libvirt-9999.ebuild 11519 SHA256 97c4435c5719e3e94658fe3c66366afc37f1bdaffe6221183635212a5061837f SHA512 a152f25c2aa41db942f0d51dd65ae4412b31ae077b3e7ca48dbe721d2792df8fc6dead7bd03fccf2c7e95821b9bb4e167877343b549a4a6949af97fdf9a9b099 WHIRLPOOL 4ecef7a049e9610e7ce891eaa31dbbe41bffaaa08686d9bca23fd5b8770c8690c338a4a78fb64536a295b9cf1f43d379bba2891e391b935519d4f4b269c69d04
-MISC ChangeLog 1747 SHA256 028373acbdd298a5bdb9050f8aabb5e8735a445ef7cc23425ddef8d5c96ea3bb SHA512 8bd221bc4817961ceeb62875cb0503d063bf62f80ddf4d0c9588fc31869f0cc19148d8bd829ebc98d4980156e053f6da3d0b5db1e5846888529eb412ad85f329 WHIRLPOOL 0b9f516cff7825b3d2bf4a63a0c2bdb18b56ebbb3267d0e74f8012483ddc8fc40be165fc0eaff2ce52defe76b2bf4fa97b2293955dda13e9a10d3a9a4d8e6cc1
+EBUILD libvirt-9999.ebuild 11908 SHA256 1ec3af7be1f4c0866daa2873d195b73cd850d7a80023ae10bac53e1a045e9843 SHA512 4b79a1bad0107f4d733341b468ee1762822e98d0c6e8ac5b6181d24cc9fe6d68c0b42feb2f4644a96dc809bc6816defe16f52b0b724bb920f2edd809fd06c7b4 WHIRLPOOL b38f9cf2e3513f50d98eefbb43e437e5b7e426e38efaf76cac966e2e0161bfa0494757873d0c64ef7bef5bc91bb1e572f6e9a7e9bf584592ebc39ad21cb59586
+MISC ChangeLog 1881 SHA256 bf177936beed05c7d31bcfe24bf516510580c66d6206d9d542e57303346413f1 SHA512 09e313e7901aa497f81a389ba408f95d1f5dbe5c2a7a4cce456e734252e89ccaf12d8b09233c71703f4eb29beaea2d0e2214a75407c4dc0ee77e751806d95997 WHIRLPOOL 7f6f48ca3b12d76c19b930d79dbe5be9a015fec900e6ca53234f1e399408a6a220b08cfb1a1db24306e0b2c1c139020f3e645cb03d06c7d8ab9be5d7b12b40e4
 MISC metadata.xml 3518 SHA256 b4d7597acd9441b02afd05f1f4d51522f657f9ecafc9a77c66e1633b4991ee8a SHA512 f5fbd24db303d44b0801d5ea78815c169a668d090e039450979b495e00a852a8fbc8bf3bd65534cfcdb7540834af3f1496ce2a9abf449e39f83975b6892a6d87 WHIRLPOOL 086aa2e815bc5bb2ad8a0c54b6d1522e40b5c60662839c5792f7f96e03af9f5706a195f2c940ed82d04267ed8c0d40838326fb714848be006fac8982ecd80485
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQF8BAEBCABmBQJRSgmPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJRThDWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDMDRGNEJFMDZEQTJGRUY3NkI4MEM3NTlE
-N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prv0ygH/jUcCCHQtqEJ4ABHLyouGzxj
-VglHBOVTyM6MienCqzSRV6+4Hoy/4K57ph5ZTXRkAMepkkJQIYyfdsAugj0G2U/J
-9mL34XC5NRgsTm9LvVHv9Dczd1Xs7UueheOr0e/G7drzII4y7ofMq9eAXFZSB0vM
-n59PXSy5qXUxTIv7CFayrFG8hMCmvG8qpNAzmoknRAHZ8NBKhRtU704nPcu6dc0m
-vT2+AOoShXUdVG6Pk+cNev1uhdZGYJ59JLMNeuqOMssizQN99f0rATlAgOZYkga1
-UcVFlytAbbInl2s3QUCE8b6GXO/67zwqq2iOcr3cNDHvfpV/gZQ4yoRy9dHpoJY=
-=iE0l
+N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prvR3AH/01f3Hn9FquhzoLrHBGniDDM
+g/gRger6ggQ58TSu55shV8AjBKcE6FDnskVqQK2LIGcxu1k/WK8j2KSP990lzIse
+18aAhHYBYhU00XWHkHnp+aBChTUcy5MIBdzT4+X69fG+7C94x2eZRlEwx5lFq19h
+JYvxSHfPMhC0WJPx/lDTJ/v6VT3ZsOOD8MoXISD7JbE7xuF5Rys5EuE1RFmI2rPY
+A30Q5CHyq+uVHj3dPI/Ui+ouaIhy5rrEhpVZLv1ix9dzRnVhzNuevfjbeEMVAl7L
+KfLPvsd2RlVRfGQatndG3nazC6yNaoBZgnuAGPXxoLCCEtcrd4RTNYZm0j38IXI=
+=X8Qo
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 2037df063b09..b6b84c6222de 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.44 2012/11/29 02:13:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.45 2013/03/23 20:30:09 cardoe Exp $
 
-EAPI=4
+EAPI=5
 
-#BACKPORTS=85e8c146
+#BACKPORTS=9bf6bec4
 AUTOTOOLIZE=yes
 
 MY_P="${P/_rc/-rc}"
@@ -22,8 +22,8 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz
-		ftp://libvirt.org/libvirt/stable_updates/${MY_P}.tar.gz
+	SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
+		ftp://libvirt.org/libvirt/${MY_P}.tar.gz
 		${BACKPORTS:+
 			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
 	KEYWORDS="~amd64 ~x86"
@@ -34,7 +34,7 @@ DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="audit avahi +caps debug iscsi +libvirtd lvm +lxc +macvtap nfs \
+IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm +lxc +macvtap nfs \
 	nls numa openvz parted pcap phyp policykit python qemu rbd sasl \
 	selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc"
 REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
@@ -44,7 +44,9 @@ REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
 	uml? ( libvirtd )
 	vepa? ( macvtap )
 	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
+	xen? ( libvirtd )
+	virt-network? ( libvirtd )
+	firewalld? ( virt-network )"
 
 # gettext.sh command is used by the libvirt command wrappers, and it's
 # non-optional, so put it into RDEPEND.
@@ -67,6 +69,7 @@ RDEPEND="sys-libs/readline
 	audit? ( sys-process/audit )
 	avahi? ( >=net-dns/avahi-0.6[dbus] )
 	caps? ( sys-libs/libcap-ng )
+	fuse? ( >=sys-fs/fuse-2.8.6 )
 	iscsi? ( sys-block/open-iscsi )
 	lxc? ( sys-power/pm-utils )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
@@ -97,7 +100,9 @@ RDEPEND="sys-libs/readline
 		>=net-firewall/iptables-1.4.10
 		net-misc/radvd
 		net-firewall/ebtables
-		sys-apps/iproute2[-minimal] )
+		sys-apps/iproute2[-minimal]
+		firewalld? ( net-firewall/firewalld )
+	)
 	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
 # one? ( dev-libs/xmlrpc-c )
 DEPEND="${RDEPEND}
@@ -160,6 +165,7 @@ pkg_setup() {
 						LXC_CONFIG_CHECK+=" ~MEMCG"
 
 	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
 	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
 	use macvtap && CONFIG_CHECK+="${MACVTAP}"
 	use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
@@ -194,11 +200,14 @@ src_prepare() {
 	local avahi_init=
 	local iscsi_init=
 	local rbd_init=
-	cp "${FILESDIR}/libvirtd.init-r10" "${S}/libvirtd.init"
+	local firewalld_init=
+	cp "${FILESDIR}/libvirtd.init-r11" "${S}/libvirtd.init"
 	use avahi && avahi_init='avahi-daemon'
 	use iscsi && iscsi_init='iscsid'
 	use rbd && rbd_init='ceph'
+	use firewalld && firewalld_init='need firewalld'
 
+	sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
 	sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
 	sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
 	sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
@@ -207,8 +216,6 @@ src_prepare() {
 src_configure() {
 	local myconf=""
 
-	myconf="${myconf} $(use_enable debug)"
-
 	## enable/disable daemon, otherwise client only utils
 	myconf="${myconf} $(use_with libvirtd)"
 
@@ -217,9 +224,12 @@ src_configure() {
 
 	## hypervisors on the local host
 	myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
-	 # leave it automagic as it depends on the version of xen used.
-	use xen || myconf+=" --without-libxl"
-	use xen || myconf+=" --without-xenapi"
+	myconf+=" --without-xenapi"
+	if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
+		myconf+=" --with-libxl"
+	else
+		myconf+=" --without-libxl"
+	fi
 	myconf="${myconf} $(use_with openvz)"
 	myconf="${myconf} $(use_with lxc)"
 	if use virtualbox && has_version app-emulation/virtualbox-ose; then
@@ -245,6 +255,7 @@ src_configure() {
 	myconf="${myconf} $(use_with numa numactl)"
 	myconf="${myconf} $(use_with numa numad)"
 	myconf="${myconf} $(use_with selinux)"
+	myconf="${myconf} $(use_with fuse)"
 
 	# udev for device support details
 	myconf="${myconf} $(use_with udev)"
@@ -260,6 +271,7 @@ src_configure() {
 	myconf="${myconf} $(use_with macvtap)"
 	myconf="${myconf} $(use_with pcap libpcap)"
 	myconf="${myconf} $(use_with vepa virtualport)"
+	myconf="${myconf} $(use_with firewalld)"
 
 	## other
 	myconf="${myconf} $(use_enable nls)"
@@ -286,9 +298,6 @@ src_configure() {
 	# locking support
 	myconf="${myconf} --without-sanlock"
 
-	# DBus access to iptables/ebtables and friends
-	myconf="${myconf} --without-firewalld"
-
 	# this is a nasty trick to work around the problem in bug
 	# #275073. The reason why we don't solve this properly is that
 	# it'll require us to rebuild autotools (and we don't really want
@@ -355,12 +364,16 @@ pkg_preinst() {
 	fi
 
 	# Only sysctl files ending in .conf work
-	mv "${D}"/etc/sysctl.d/libvirtd "${D}"/etc/sysctl.d/libvirtd.conf
+	mv "${D}"/usr/lib/sysctl.d/libvirtd "${D}"/etc/sysctl.d/libvirtd.conf
 }
 
 pkg_postinst() {
 	use python && python_mod_optimize libvirt.py
 
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
 	# support for dropped privileges
 	if use qemu; then
 		fperms 0750 "${EROOT}/var/lib/libvirt/qemu"