Backport fixes to prevent rebooting of all guests when using PCI passthru devices.

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

3 files changed, 450 insertions, 10 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 8db936a117a3..4e6cf38cda2f 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,12 @@
 # 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.274 2013/05/28 17:07:00 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.275 2013/06/04 20:02:25 cardoe Exp $
+
+*libvirt-1.0.5.1-r2 (04 Jun 2013)
+
+  04 Jun 2013; Doug Goldstein <cardoe@gentoo.org> +libvirt-1.0.5.1-r2.ebuild:
+  Backport fixes to prevent rebooting of all guests when using PCI passthru
+  devices.
 
 *libvirt-1.0.5.1-r1 (28 May 2013)
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 64f7ec821361..b4f2d45e0405 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -10,25 +10,27 @@ DIST libvirt-1.0.2.tar.gz 22971729 SHA256 9b8c2752f78658b65ef1c608b3775be0978d60
 DIST libvirt-1.0.3-9bf6bec4.tar.xz 7032 SHA256 841f062bd4185ac36a5633103c899d4ef5da6a2092ef1a2f7125298ec336b18b SHA512 7eeba343a27c4dbe5e984641082c6f8c59ba0c04a22c5a3e390c0bf03e65a966e7db15be732c61473d2dfb245bdd53f950d3a848980153b90310439b781bbcdc WHIRLPOOL 8d90ebc9fc17a7c8ac119f34b2e64679322878c0c8dd7eb837f2b5e89047b084ec87e9966841d0aaf7ed19e75548b9d5f5f66d461e2f177a5e817669471a27c8
 DIST libvirt-1.0.3.tar.gz 23238381 SHA256 f64f4acd7cdcfc6ab5e803195ed58b949f262b54e3659d8c37b33f0fec112757 SHA512 f0002d40a018e22bd05c9bc990db0b14e0ec815613f54d04fc3b631081d87b6659620188da9f0ba376f290206d979467013274ab99b7394c66bde54c82e08fb4 WHIRLPOOL 29dad8e6b1e4d61fe83fc450436c0fdc200b360f93772c2fefe40ab443ec2a7cb6566e634d15290beb4f7ea1f461503b1cd86accddde59659ed46b60b56e3d76
 DIST libvirt-1.0.4.tar.gz 23353253 SHA256 d94c99ce286f5a89eb02c9f3d9d620930df1f9348262a60199b4a565a222c9a0 SHA512 5e867e48c12180840fcdfebb85e7349b704ae923cdb188d41009788d39ff64c25483e608805ccb0e91eee164c8c6e89ac08643649e495ad04668a11f7aa5a8f6 WHIRLPOOL cb44708897b485a5a63b2ae107d869c9deb09cbbb9288c32ee73cb513a6e895cf4ceae948719e449cf2f5eeed4b490e7c421dc2ea3bcec865a946a56f0a01e15
+DIST libvirt-1.0.5.1-dc200aa8.tar.xz 4796 SHA256 8ef94c68621d06bd915a25db6cfb45b0ee95db7312da278923ec89f4768b176b SHA512 9c21b4e0cef5da74872214a98eeb2bdf0d31376fce7745862b122167ed5f18487cc6c18e0328faefc993ba78abffa01c83262c53401710d62642507b002ae280 WHIRLPOOL bc09f49cda8077230241af0616d0396e9f71bb6d5087010c17084895af583957b7ac3ae2977f3e330d77192c933fea870a19a01e72fb55bc2dc90437c9b7ef63
 DIST libvirt-1.0.5.1.tar.gz 23928327 SHA256 38a67d9dc979ed28440791eb3fd63e94e4d04e4efbe7554a83bdf0cc614d0a6e SHA512 8cc3850dcda93b2d4efcd055a91ca9f2a619ccb9585e5b9fd7e2daf6ee8e93c1a0354fbc7fa06f6d5663913f358c2fbd9569a5e307b90e91607b0e049f00c89d WHIRLPOOL 51298d87cddee79f352609306c77d3f1813684c931b11ea577d96560e366b112dfc625553a86fe21c291d7e9bba86024055b236029be56c3c6390cde49875e8b
 EBUILD libvirt-1.0.2-r2.ebuild 11853 SHA256 cfff47a9f5bd41edfb2db44755800c42576a0e6f378fa8b3cdbf0f120d0a7ec2 SHA512 c4dcaefb32a9be93e5c7836db45332645a5fb1b4aa96f338dd417552e450e896f6334887001cab591c6d9efe0bea6fc4ddb573d21cfc6ff686c91f02fe1cd290 WHIRLPOOL c6857ac5588ef3aea6bffe4df5ed254f4941d9e647642bf23575d6cd3357250d0c2e9ac4a40fb17a25a390b71604fb7671a8fe7ab619559e7f24552165722a6e
 EBUILD libvirt-1.0.3-r2.ebuild 12003 SHA256 9487bfd65d6c0f959c0932d78a3852906283473e2cea81c6f481a291e01e19f8 SHA512 e330564b03751f950da2a83a1018f857631231b27b7976d379ee1bfc44bf6e5929c08a1f69f3a4fde7ccf92f25a90a25e720c6ad6c9ec6efa15c27a8a6cf6814 WHIRLPOOL 9ee7c51da91107e99247e0d1eb0bf4d22110fc43cdb5c47b749e5d2a2226c882ce9d5c5b0a5761ce01ac1344ce7d375670e6935ce760c47766f042c96e3247d6
 EBUILD libvirt-1.0.4.ebuild 12003 SHA256 cf78e7e1b6d2a649f5bc9809aad9f1deda023acd06df7d1143a6d5fd0425d669 SHA512 be893f168ab1bb1fa283dd1bbab059638f4ab5e3957958a6b285f438389152df2041a4d8c5bdc17dc2f53ce46449e0a28be6666dd8ba0a41b507ae2e2a3ff41a WHIRLPOOL a527fdcb016734fbf005dc674ef0515462b7d6f41f4755bfe90ee297bcab1e9405b6d3a081c270917a57b8c91618ba2082adf7de7377c6594025f5a339aa11f1
 EBUILD libvirt-1.0.5.1-r1.ebuild 12272 SHA256 555340d0346a948bad6a6f9d3911878f0987403d33cb12656dd463b6244cbed8 SHA512 51218973d83c94c521de7efbfe3d6cd7440a1aa2bcf3333bbdf7aff5ab9282c7c4308bad2854c10fa86067e22a77b019e040e68535887d9c5e0074dbfc54359c WHIRLPOOL d25a89497c7825d5d6c19c9621fde750996222cd10d45309c92cffc69db97ce1f7c4f2ab24f4bb5acef1291585bc927876a70c179dd925b4d5e1636c69e1ecf1
+EBUILD libvirt-1.0.5.1-r2.ebuild 12192 SHA256 a44c31540e64b1428a34c1e78191437025cc52be2d37b1a88e9b010d6ccd7be3 SHA512 45eeec184a92d7e3cc5c482131c9c11d09807b5b1b36f4847516714b6e96b60ec97a4a2ad8596d6937e9933c498d4c41b6bce576b4ca6044372ba07b3987da70 WHIRLPOOL 58d90ddb39c36a3966e8ed5abe32bbf27115fff2420b69dca129f9fc4392ac6384ff734b9f701d08b0ee88dd153cab6551b387fc446fd3623422ef7d958fa0c5
 EBUILD libvirt-1.0.5.1.ebuild 12190 SHA256 8cd437a87cf22a9d6361d3cc5b8edaa4f011153286e2090c35638235e374d031 SHA512 f90eb088c10a8c9b94ae0195cb104b0776fd6cd28fd098987d0de4765e9da1b54a0f2841570a9ec54557a11f0d86fbabcc8a289194f760352a539ef7a1c3182f WHIRLPOOL 8cd9e3afc9e2c3f1aef49678642dc45efeb846a18db91e16c611ee768d326a6b478145d90b6012a1dbecd7d89220d9a22905771cde33835e024f786931828901
 EBUILD libvirt-9999.ebuild 12105 SHA256 feaa2fae6c1cd35f1d834267189fd2ed8a83a8b83eb356d45f8983722eb50202 SHA512 ce7a32702484cc33c07754c031b9fcd633dac29b7efb430ce02e36294809d821e13146c75ad9e6d622cf673392de87c2f18f426111efea97fd9f62a9346c3363 WHIRLPOOL 5ad7f14c98c5419c67e3ed0e2cc6a26b8e2efc228f1d84468f0748e933cd531b8aa2397c67518dfb6a49ef5941120e830b275212521c8cfa9958db58f8e530c0
-MISC ChangeLog 4320 SHA256 3ba6f43964ef2cc27f312b922d3e9ffb271b0396a892b8f9cfac34a75f429464 SHA512 6fe4d113725144d098a88fedbbf04b30fee663633eacf9816b07eaff9632bed73ed061c42e195548a433991a0a19f72287ec6af10800e43cdd7c613462778c87 WHIRLPOOL fee46c39351b954a81660e69a4b81a153ae7a736cc3b79b751b7d56994e4782fd2707cfc91c15a183911ef084a2b212358021dac1b25dd2d7ed50e5ef0a2227a
+MISC ChangeLog 4521 SHA256 1ce92263ac12049df24aa56a83894a8c77439360019b9b06eaf1a9325a05a35d SHA512 8e18e8e362c371341342dc884513214f08885e4f04ca00b2e9138e7cb9d65b0b54a05996c4660d85e4aa4be0074d76550518c5900cd36f9806a05bcab213cc2b WHIRLPOOL a48bee9241ff976899d8d75560ccbf396a2a56c251c6db650dbf8759c25442937f5516834c02cbdc9ce3d0d86fbc13bb6091f6d7c7ade45fec364f4f45775209
 MISC metadata.xml 3518 SHA256 b4d7597acd9441b02afd05f1f4d51522f657f9ecafc9a77c66e1633b4991ee8a SHA512 f5fbd24db303d44b0801d5ea78815c169a668d090e039450979b495e00a852a8fbc8bf3bd65534cfcdb7540834af3f1496ce2a9abf449e39f83975b6892a6d87 WHIRLPOOL 086aa2e815bc5bb2ad8a0c54b6d1522e40b5c60662839c5792f7f96e03af9f5706a195f2c940ed82d04267ed8c0d40838326fb714848be006fac8982ecd80485
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQF8BAEBCABmBQJRpOQ3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJRrkfVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDMDRGNEJFMDZEQTJGRUY3NkI4MEM3NTlE
-N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prv/kAH/2qp2eu7/JQ3G2izoSNWce1l
-8MHJHqS6e0+JeBDvrEMnO51MSwmsBf1Mj2m+SCm2gkksD+LDhAZIztqCPfn8GC1E
-nSFtyvtVg+1PmApMxVrNRa39oP2+WcXWJhQ9wf7IWdzQJxXWnwBF9+4lBmq9Macz
-Qazi5Dhk+9v5ly17S3qoQek4Hk2DHFE1LleUh2n5tJygpHPJckwxOQNMPVrQQghx
-vecQ6Yy1Dtx4L0IjYnP8JNin/pntWZy8wO0qGHj2UvNuhRbE6+2/C+266LidKi4I
-E1oBCY4D0ES9Urx7MbpNFEIdd8EN5JGp398HzOxaHSXUoFvOth4TyDXhAvMTzEQ=
-=914m
+N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prv3jgH/0pADOqL6vEOfDMVKN9FkDYb
+gDHSCqVZNHV9JymzCVUmrPvAQl9xWnSONyNjwt3Yj8CAZHJ7UHPrptIFcbalceM8
+yw8B++u8L5lmCUCnFuTC0gdie0CA4mVaZ48OO5aY0e44xzr7cg+Bv4bIB8N7kqyj
+6gqhKiCUvS6BOSqgE/kSRLgCBILWCnRJhAljgCax+qj2EJSrQ/Vxu8mNsyvdDD6T
+uNk0Kevg3T8vdLRSrYolPEoT1gH4hotgag3dlFVU4HdeYenqrLt/KGyTI5EeQXos
+yOx497HDk4MtKup6VNLykvV1LvkyC2YT8FWb7Yi6LUbimBp5A8+oTok4J0ntQR0=
+=M771
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-1.0.5.1-r2.ebuild b/app-emulation/libvirt/libvirt-1.0.5.1-r2.ebuild
new file mode 100644
index 000000000000..40d665525814
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-1.0.5.1-r2.ebuild
@@ -0,0 +1,432 @@
+# 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-1.0.5.1-r2.ebuild,v 1.1 2013/06/04 20:02:24 cardoe Exp $
+
+EAPI=5
+
+BACKPORTS=dc200aa8
+AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+PYTHON_DEPEND="python? 2:2.5"
+#RESTRICT_PYTHON_ABIS="3.*"
+#SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils python user autotools linux-info systemd
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+	AUTOTOOLIZE=yes
+	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
+		${BACKPORTS:+
+			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~x86"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+SLOT="0"
+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 \
+	systemd"
+REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	uml? ( libvirtd )
+	vepa? ( macvtap )
+	virtualbox? ( 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.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="sys-libs/readline
+	sys-libs/ncurses
+	>=net-misc/curl-7.18.0
+	dev-libs/libgcrypt
+	>=dev-libs/libxml2-2.7.6
+	dev-libs/libnl:3
+	>=net-libs/gnutls-1.0.25
+	net-libs/libssh2
+	sys-apps/dmidecode
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	>=net-analyzer/netcat6-1.0-r2
+	app-misc/scrub
+	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 )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	openvz? ( sys-kernel/openvz-sources )
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	qemu? (
+		>=app-emulation/qemu-0.13.0
+		dev-libs/yajl
+		sys-power/pm-utils
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+	xen? ( app-emulation/xen-tools app-emulation/xen )
+	udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
+	virt-network? ( net-dns/dnsmasq
+		>=net-firewall/iptables-1.4.10
+		net-misc/radvd
+		net-firewall/ebtables
+		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}
+	virtual/pkgconfig
+	app-text/xhtml1
+	dev-libs/libxslt
+	=dev-lang/python-2*"
+
+LXC_CONFIG_CHECK="
+	~CGROUPS
+	~CGROUP_FREEZER
+	~CGROUP_DEVICE
+	~CGROUP_CPUACCT
+	~CGROUP_SCHED
+	~CGROUP_PERF
+	~BLK_CGROUP
+	~NET_CLS_CGROUP
+	~NETPRIO_CGROUP
+	~CPUSETS
+	~RESOURCE_COUNTERS
+	~NAMESPACES
+	~UTS_NS
+	~IPC_NS
+	~PID_NS
+	~NET_NS
+	~DEVPTS_MULTIPLE_INSTANCES
+	~VETH
+	~MACVLAN
+	~POSIX_MQUEUE
+	~!GRKERNSEC_CHROOT_MOUNT
+	~!GRKERNSEC_CHROOT_DOUBLE
+	~!GRKERNSEC_CHROOT_PIVOT
+	~!GRKERNSEC_CHROOT_CHMOD
+	~!GRKERNSEC_CHROOT_CAPS
+"
+
+VIRTNET_CONFIG_CHECK="
+	~BRIDGE_NF_EBTABLES
+	~BRIDGE_EBT_MARK_T
+	~NETFILTER_ADVANCED
+	~NETFILTER_XT_TARGET_CHECKSUM
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MARK
+"
+
+MACVTAP_CONFIG_CHECK="~MACVTAP"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
+	enewgroup qemu 77
+	enewuser qemu 77 -1 -1 qemu kvm
+
+	# Some people used the masked ebuild which was not adding the qemu
+	# user to the kvm group originally. This results in VMs failing to
+	# start for some users. bug #430808
+	egetent group kvm | grep -q qemu
+	if [[ $? -ne 0 ]]; then
+		gpasswd -a qemu kvm
+	fi
+
+	# Handle specific kernel versions for different features
+	kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+	kernel_is ge 3 6 &&	LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+
+	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}"
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	touch "${S}/.mailmap"
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	if [[ ${PV} = *9999* ]]; then
+
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+			git submodule status | sed 's/^[ +-]//;s/ .*//'
+			git hash-object bootstrap.conf
+		) >.git-module-status
+	fi
+
+	epatch_user
+
+	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
+
+	# Tweak the init script
+	local avahi_init=
+	local iscsi_init=
+	local rbd_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"
+}
+
+src_configure() {
+	local myconf=""
+
+	## enable/disable daemon, otherwise client only utils
+	myconf="${myconf} $(use_with libvirtd)"
+
+	## enable/disable the daemon using avahi to find VMs
+	myconf="${myconf} $(use_with avahi)"
+
+	## hypervisors on the local host
+	myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
+	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
+		myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
+	else
+		myconf="${myconf} $(use_with virtualbox vbox)"
+	fi
+	myconf="${myconf} $(use_with uml)"
+	myconf="${myconf} $(use_with qemu)"
+	myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
+	myconf="${myconf} $(use_with phyp)"
+	myconf="${myconf} --with-esx"
+	myconf="${myconf} --with-vmware"
+
+	## additional host drivers
+	myconf="${myconf} $(use_with virt-network network)"
+	myconf="${myconf} --with-storage-fs"
+	myconf="${myconf} $(use_with lvm storage-lvm)"
+	myconf="${myconf} $(use_with iscsi storage-iscsi)"
+	myconf="${myconf} $(use_with parted storage-disk)"
+	myconf="${myconf} $(use_with lvm storage-mpath)"
+	myconf="${myconf} $(use_with rbd storage-rbd)"
+	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)"
+
+	# linux capability support so we don't need privileged accounts
+	myconf="${myconf} $(use_with caps capng)"
+
+	## auth stuff
+	myconf="${myconf} $(use_with policykit polkit)"
+	myconf="${myconf} $(use_with sasl)"
+
+	# network bits
+	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)"
+	myconf="${myconf} $(use_with python)"
+
+	# user privilege bits fir qemu/kvm
+	if use caps; then
+		myconf="${myconf} --with-qemu-user=qemu"
+		myconf="${myconf} --with-qemu-group=qemu"
+	else
+		myconf="${myconf} --with-qemu-user=root"
+		myconf="${myconf} --with-qemu-group=root"
+	fi
+
+	# audit support
+	myconf="${myconf} $(use_with audit)"
+
+	## stuff we don't yet support
+	myconf="${myconf} --without-netcf"
+
+	# we use udev over hal
+	myconf="${myconf} --without-hal"
+
+	# locking support
+	myconf="${myconf} --without-sanlock"
+
+	# systemd unit files
+	use systemd && myconf="${myconf} --with-init-script=systemd"
+
+	# 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
+	# to do that right now). The proper solution has been sent
+	# upstream and should hopefully land in 0.7.7, in the mean time,
+	# mime the same functionality with this.
+	case ${CHOST} in
+		*cygwin* | *mingw* )
+			;;
+		*)
+			ac_cv_prog_WINDRES=no
+			;;
+	esac
+
+	econf \
+		${myconf} \
+		--disable-static \
+		--docdir=/usr/share/doc/${PF} \
+		--with-remote \
+		--localstatedir=/var
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
+}
+
+src_test() {
+	# Explicitly allow parallel build of tests
+	export VIR_TEST_DEBUG=1
+	HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		HTML_DIR=/usr/share/doc/${PF}/html \
+		DOCS_DIR=/usr/share/doc/${PF}/python \
+		EXAMPLE_DIR=/usr/share/doc/${PF}/python/examples \
+		SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
+		|| die "emake install failed"
+
+	find "${D}" -name '*.la' -delete || die
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newinitd "${S}/libvirtd.init" libvirtd || die
+	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
+
+	keepdir /var/lib/libvirt/images
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	# We really don't want to use or support old PolicyKit cause it
+	# screws with the new polkit integration
+	if has_version sys-auth/policykit; then
+		rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
+	fi
+
+	# Only sysctl files ending in .conf work
+	mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${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"
+		fperms 0750 "${EROOT}/var/cache/libvirt/qemu"
+	fi
+
+	if use caps && use qemu; then
+		fowners -R qemu:qemu "${EROOT}/var/lib/libvirt/qemu"
+		fowners -R qemu:qemu "${EROOT}/var/cache/libvirt/qemu"
+	elif use qemu; then
+		fowners -R root:root "${EROOT}/var/lib/libvirt/qemu"
+		fowners -R root:root "${EROOT}/var/cache/libvirt/qemu"
+	fi
+
+	if ! use policykit; then
+		elog "To allow normal users to connect to libvirtd you must change the"
+		elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	elog
+	elog "For the basic networking support (bridged and routed networks)"
+	elog "you don't need any extra software. For more complex network modes"
+	elog "including but not limited to NATed network, you can enable the"
+	elog "'virt-network' USE flag."
+	elog
+	if has_version net-dns/dnsmasq; then
+		ewarn "If you have a DNS server setup on your machine, you will have"
+		ewarn "to configure /etc/dnsmasq.conf to enable the following settings: "
+		ewarn " bind-interfaces"
+		ewarn " interface or except-interface"
+		ewarn
+		ewarn "Otherwise you might have issues with your existing DNS server."
+	fi
+
+	if use caps && use qemu; then
+		elog "libvirt will now start qemu/kvm VMs with non-root privileges."
+		elog "Ensure any resources your VMs use are accessible by qemu:qemu"
+	fi
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup libvirt.py
+}