version bump

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

3 files changed, 486 insertions, 16 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 2e5e0fee9d34..561e1d230bac 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.419 2015/03/13 13:53:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.420 2015/04/05 20:47:47 tamiko Exp $
+
+*libvirt-1.2.14 (05 Apr 2015)
+
+  05 Apr 2015; Matthias Maier <tamiko@gentoo.org> +libvirt-1.2.14.ebuild:
+  version bump
 
   13 Mar 2015; Agostino Sarubbo <ago@gentoo.org> libvirt-1.2.12.ebuild:
   Stable for x86, wrt bug #543044
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 0e93cad0b27f..9785a24b86c1 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -14,27 +14,29 @@ DIST libvirt-1.2.11-20150127.tar.xz 1248 SHA256 a5ba09f85eb2bbe5f6a727c667777b5b
 DIST libvirt-1.2.11.tar.gz 30571605 SHA256 1b886429734a53fc9a201f46d77448fda963e1323246269eb0dcb4c12fb02fcc SHA512 4aaeb2eeb563f0a9105a1586054d69c24dada12ddf9b71edd3742ad602eb8c892d9f615ee1a2159051bec52699897c6707d9d0204b8f0fe61bae15885ee986f2 WHIRLPOOL b64ee58d633e4b3fec52125bd9b582f7d07045baa66c492fd2b6bc521d994cec95fa460c3a8b32a0f73043ad812e36d81832c31046bbacc280fb2f2764e9bd75
 DIST libvirt-1.2.12.tar.gz 30710487 SHA256 eff5227f774560d97f0b44402a444e821c51e8cd44add89f74bc3c1f4dede66a SHA512 643986d72886fe3de0191b282f561241721a8967911418ff317cecd68e1afb13f32e0aeb5000ae11cc452bfaac6220c472091276c81a69eb569166b87d05e736 WHIRLPOOL 1b02150643145efb851335139661b69999641904c1350c3a1b391efcc7761de7c28ba19307867e21a5c1516da8ab365e01fcdfb542efb56a3cce8ed61be65f0f
 DIST libvirt-1.2.13.tar.gz 30861600 SHA256 944163d93949db61f49eace85838b1bd55ce855e88b014df16c50fd2102bdaf6 SHA512 f590cd4ad55fb8f09980ba2dfd05eb6b978c602c2eecc1188acc6536ae2d4ffb8ad70756a39c95b2b69688981e950cce3e7f232bf96b50fdb01d60b05ecf990d WHIRLPOOL b46013116fe3872156de29c2c27bb76c5ad9fad08d7e489ad061db2be1d82e7d64117e3dd90ca999efb9edd35584ff944c03659fd6690fd9f961586d255a8d97
+DIST libvirt-1.2.14.tar.gz 28947850 SHA256 b8e8e6f1fc91eb8694fa21f9c57a736fa4a5af10562e14e4aa2c7e23510c4c07 SHA512 ea5a68211ce3940f73444777ae5e2c8de7405df3e1a78d2871a9e18591bc8bf036288a6733da5ab23180b6ed88e03347e898554a46c0ad440da48590b32340ad WHIRLPOOL 8a9791a780c3daa416abeff711a9204093b4f979a2bb1ee8d2adb93f033b48ff3c576811b1f8d943a3f93a95cab9592293d9b4309f11eb2b16515b32cf5cc033
 EBUILD libvirt-1.2.10-r4.ebuild 12902 SHA256 f858482a2dbdf5e57c7796189104d61f4abbe02511ce2d8cd2056b8db0180c9b SHA512 ab297624547f37c54566c11c70fe2729f02478c8cebdcb622f6ca62e0a3caf0a59ed55f1dfb2075a98ef47921faea858c1fd529865a48a2d8f89c2d888dc6e17 WHIRLPOOL b34f218eda9bce6e4d3ec72affbdf6cd74354fee1645a5479684d26a55674e25a1dc43b7b1e23cb6747b729fc1de69f1303937d2a10d73898769997f7a8cbe23
 EBUILD libvirt-1.2.11-r3.ebuild 12980 SHA256 4fe76409fc40c43420f0b9dbca9a6d32fbed1623c4a00aa7d2dab126ce65f18c SHA512 c3582840553a7998cf0808e594e9ca128489da9385a41c2bddc16b0255b30ed2d7a3f86f38271395ec01684efb9fe93ba98343dcf26c08a2a5eb5db46e4f38f6 WHIRLPOOL 7d2dbdb1358dd7897df4e0e4cadfc8bf55472d40e082912305fed29d5cd12fef55a20cdba158104f05ea1a609c7b968cbb7f4889662ce68bbdf98b7f7156846a
 EBUILD libvirt-1.2.12.ebuild 12984 SHA256 23f9d7cd4f746c4cdfda86ddb4b8e27a8ff8bc0455f1f091448aebcc19c07da3 SHA512 e57eec350d44043283a955064afcee8c5133abc02d1d231ef0ef235713f6c8ab15dc0ece5bfd66f13380725ea72b1976f1a39c1f955db8ec7eee7c1d3d4ddd88 WHIRLPOOL 57a32c3fb735bd22f88451bf8477138159d655ffd6e3b2d32c4cc09a92edfc4fec3e5781f561fb5772ec0df00e3b2d3ef86ce2e3f5dc38d49c42d1ec8ef8b68e
 EBUILD libvirt-1.2.13.ebuild 12989 SHA256 c520391752508978c461284442e8b88e5fd8c34cc72eb06ce7988ccf85c805e4 SHA512 88e187ddfd0b36dba643670c943e7bdf9baef0ed57355a12c133d68807db3c42a05350b8a30700550b801bdbe02acdc593b98eba4acc9b4785b2ab59135e9314 WHIRLPOOL 74ea714c8c441518d43a19771a5f87226231bb07ae18c40befcc2b537b8d38bf4af0b8ce8e6cf8e6ae08f48cf4fa7de3f63f9a1ce34dfef5517e2e42fcf15e42
+EBUILD libvirt-1.2.14.ebuild 13012 SHA256 fd6723de75aaab0e0722136eadee653c043804c22c5b20ff76cfccc87fceedf3 SHA512 413b3a6b92c1ed7f129a7a5f1917aa987fbed53bcfd40f47940b0bfe5ef44b4e60936c03ef2e80ffdf8aed86ec63b70aa6a691ddf72d38a6ec8303fab8b85383 WHIRLPOOL 560c774ac8fefc61f678551fad71924a8859395be08db88e327ed99f2acbe9ea07ffe4a6b844e988dbcb2d12a7f0ce7f5e375e6bb4900da5c9c9752f15e0715a
 EBUILD libvirt-9999.ebuild 12988 SHA256 98cdb6ef8c4f90d4061d0f2f3747933488103462264de37699072089fb436f9f SHA512 c0d9d4fe8a0156259b21088f32c196946af9f70b5e7004bd60d14ab96fd25d8febbffe394768ea00281b3c7465a6e29c1b3c711648f2daf3b8fb90fcd14d37d3 WHIRLPOOL 1cf5c3669dac38949635459a688ec476f6355dd34fdcf185b50218e673480d59069ba2609af5597579fb2df762a7e03f47721c21661f79e6872403da54a5a253
-MISC ChangeLog 27022 SHA256 b5363e2e9539e6c86319e58f1a1aef601d0217a384ee11779b89e4d214c0808d SHA512 04d6e4f35b08acae24a6707f704dc94b812553caafce136cc3e7367880ed302eb88548067f0c49078789e67995b3341ea3198b186e8084b00ef5a4a4c8f8b65f WHIRLPOOL 151b6520294e0f296a875a58a63051448669e2db4cc573796e5c826258e4eceaff74c7548832323338d9b91bcce457cc792db226b45c5fd0c56bd804d3214594
+MISC ChangeLog 27146 SHA256 9e0167e2448b467c3631e4fb8bb4e2f1f943c83d4ca49ae31f30a7d7a349cd3c SHA512 bd0766bb30f6c74f2f6b01e4da97490db07fa819957d48860d6520e07ed2f4870acad182bfd1d9fc757172ebab504786a645d5970388eb4d14d0db9c3bdfba3b WHIRLPOOL b60698345ed7e514855e36dc3c41b8437aeee9c59d243c19584e6c80440f9ed8ad94340fbe91eb8031511eb9b9bc764ffe451569b9127274a1b2859bc3ee8e4e
 MISC metadata.xml 3604 SHA256 90d98bcf32df9c4ff5d3fc90cdcac46ddc486efa9706b945cbf749d4a1ddcd30 SHA512 35b1fd9faa961efddec324d3721699068b9b2aefb49271f064b3930c9c246a71829f55566438754c34f294db9b8c2ad55386113a72ab11b31cbb604e4afe7816 WHIRLPOOL 6315f8a01134f62a1f7b9845f0e89624bb1edd713b4965a53209b199609ba4f510f0cbb4ee85f348947556cdeee27ab7ae7fcf52b1b9ed82176076d149c00116
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJVAuvkAAoJELp701BxlEWfdRoQAMZwtkNvnEZjNEroayRFbDhb
-ZvdWogf/vsY75n1DCa+mTpZTnCbxM3e37dYEJnPYx4Re1fD5B0n24+fbaBC+xd9e
-RZh2yWtvFxo0W90BqE1zuVlTOKJi85KtWeg9HoCNuZ01NHvnCDh4E1RSuyUSHzR1
-axi5Gj2wXCVOUiD2D7Zsn5/rdiDk4h1BneB8tI16K0JdwLkXx4G0ngdFygSKOKAM
-xs31SWj8zYboslkga3OQmaZegMXxpk6LL0ba1QyG5aKIP85KiumwFGPT80YFvVDw
-YA3AmaUaKwA1vKRZiafuvV4PAYhrb/CapvjpvIT7tFP7CCgd6uTfbI7dfUiDkNja
-UxVAu9EdwWl2c5PNnOqK+O8Di1xiEcGeXlWfRqStgIy5JxwfYqk9ea0Ui0nLzngV
-AjUI3rL4/sgp65J3CSXhwxe2wfe8qiS45zn+PIcKz5thcWxrvvSpTsEydu5ys3HQ
-VIAM+iwMWOHV9bszCnoMWJzL35ntiysWC37JO4IEaWCx0N4D3eSaCQcJIo39sFiy
-sNvYGcF3sc7x8d0xB0E9m/Vcfq/cSzpTAUcUjakCvdNeRpD4iQuhSJ/L+9lgkKzm
-KAtrcAoQfFXqd6KSY1MyPo9xdjcoRLe0x6QcYsMEk2fsjAc8NF6djepW0RSAr3Or
-uQQyI4sabOjq1xW60PbA
-=szQT
+iQIbBAEBCAAGBQJVIZ9uAAoJELhOzYlK7nn/AWcP+Oer9iymiqWJYVnEs2kDsius
+2sC1jAV5x/qNUEi1g3+NdD67+2PCB3fwT/2KDbTY8uunrARahoWALdziBQI/bzhS
+g7bJAjFf4VIFA0CYbq8Ljc/nCFmXQf7dTLoWAIoIxa78nVp3gKKzM9TGqWGta3Kr
+CEncMlpy8hXS51M5vSfPRWMBxSXP4cyQg0s4SCj1eDJLAEoobPCOhTsxT02DCPvE
+W0JwdslrADki3RT4Ny4VCt+KuiSeCd3BS+NSsCAzDvdV66Odv/ntl54AgkHteZDR
+aR6yhD+wUnerAMAmtVQxpeSYdD+68kKmXyO9eK96rO7P5/qRNZx5h//x8UcjpADt
+HLdMh/WYMHHbaGNW6HlJWDYlxpGn389MC7YSoC2KLzzncxIhEGAPLcaGYpwnklWs
+8TwnIt+QU/GnJtZvdJb1nUuNXm4s8/dBFVBLpi+qgQRXoHrLkWAcJNdz7hJv44AE
+z8a9Sf+heOTjIRfOczWO8QVax0avoHrSHUaYB8Kygf0zU+R8qGwK/uxq8HKVu1kJ
+k1nQ42J1KSRz5igdpAHpW8GC9YMB2jnBYw4GuT6VpR1LZQY7/3vfUs6PhHHd2mZ0
+fxed30+WH1bu2Qizj5vI1rV+oRTEDiEGl7Rd/6qgmvCZ6ZKd7YTcmy/LBZs5aBkO
+hMRyMZzk14lYQiJlODo=
+=oThZ
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-1.2.14.ebuild b/app-emulation/libvirt/libvirt-1.2.14.ebuild
new file mode 100644
index 000000000000..57c7fdf98a8f
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-1.2.14.ebuild
@@ -0,0 +1,463 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.14.ebuild,v 1.1 2015/04/05 20:47:47 tamiko Exp $
+
+EAPI=5
+
+AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+inherit eutils user autotools linux-info systemd readme.gentoo
+
+BACKPORTS=""
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+	SRC_URI=""
+	KEYWORDS=""
+	SLOT="0"
+else
+	# Versions with 4 numbers are stable updates:
+	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
+		SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz"
+	else
+		SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz"
+	fi
+	SRC_URI+=" ${BACKPORTS:+
+		http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
+		http://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~x86"
+	SLOT="0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+# TODO: Reenable IUSE wireshark-plugins
+IUSE="audit avahi +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 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
+
+# wireshark-plugins? ( net-analyzer/wireshark:= )
+RDEPEND="sys-libs/readline
+	sys-libs/ncurses
+	>=net-misc/curl-7.18.0
+	dev-libs/libgcrypt:0
+	>=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 )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( sys-block/open-iscsi )
+	lxc? ( !systemd? ( 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
+		!systemd? ( sys-power/pm-utils )
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	systemd? ( sys-apps/systemd )
+	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[script]
+		>=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 ) )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-text/xhtml1
+	dev-lang/perl
+	dev-perl/XML-XPath
+	dev-libs/libxslt"
+
+DOC_CONTENTS="For the basic networking support (bridged and routed networks)
+you don't need any extra software. For more complex network modes
+including but not limited to NATed network, you can enable the
+'virt-network' USE flag.\n\n
+If you are using dnsmasq on your system, you will have
+to configure /etc/dnsmasq.conf to enable the following settings:\n\n
+	bind-interfaces\n
+	interface or except-interface\n\n
+Otherwise you might have issues with your existing DNS server."
+
+LXC_CONFIG_CHECK="
+	~CGROUPS
+	~CGROUP_FREEZER
+	~CGROUP_DEVICE
+	~CGROUP_CPUACCT
+	~CGROUP_SCHED
+	~CGROUP_PERF
+	~BLK_CGROUP
+	~NET_CLS_CGROUP
+	~CGROUP_NET_PRIO
+	~CPUSETS
+	~RESOURCE_COUNTERS
+	~NAMESPACES
+	~UTS_NS
+	~IPC_NS
+	~PID_NS
+	~NET_NS
+	~USER_NS
+	~DEVPTS_MULTIPLE_INSTANCES
+	~VETH
+	~MACVLAN
+	~POSIX_MQUEUE
+	~SECURITYFS
+	~!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
+"
+
+BWLMT_CONFIG_CHECK="
+	~BRIDGE_EBT_T_NAT
+	~NET_SCH_HTB
+	~NET_SCH_SFQ
+	~NET_SCH_INGRESS
+	~NET_CLS_FW
+	~NET_CLS_U32
+	~NET_ACT_POLICE
+"
+
+MACVTAP_CONFIG_CHECK=" ~MACVTAP"
+
+LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
+
+ERROR_USER_NS="Optional depending on LXC configuration."
+
+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 lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
+	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
+	use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
+	use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="${BWLMT_CONFIG_CHECK}"
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	touch "${S}/.mailmap"
+
+	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 "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch
+
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
+			EPATCH_SOURCE="${WORKDIR}/patches" epatch
+
+	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-r14" "${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+=" $(use_with libvirtd)"
+
+	## enable/disable the daemon using avahi to find VMs
+	myconf+=" $(use_with avahi)"
+
+	## hypervisors on the local host
+	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+=" $(use_with openvz)"
+	myconf+=" $(use_with lxc)"
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myconf+=" --with-vbox=/usr/lib/virtualbox-ose/"
+	else
+		myconf+=" $(use_with virtualbox vbox)"
+	fi
+	myconf+=" $(use_with uml)"
+	myconf+=" $(use_with qemu)"
+	myconf+=" $(use_with qemu yajl)" # Use QMP over HMP
+	myconf+=" $(use_with phyp)"
+	myconf+=" --with-esx"
+	myconf+=" --with-vmware"
+
+	## additional host drivers
+	myconf+=" $(use_with virt-network network)"
+	myconf+=" --with-storage-fs"
+	myconf+=" $(use_with lvm storage-lvm)"
+	myconf+=" $(use_with iscsi storage-iscsi)"
+	myconf+=" $(use_with parted storage-disk)"
+	mycond+=" $(use_with glusterfs)"
+	mycond+=" $(use_with glusterfs storage-gluster)"
+	myconf+=" $(use_with lvm storage-mpath)"
+	myconf+=" $(use_with rbd storage-rbd)"
+	myconf+=" $(use_with numa numactl)"
+	myconf+=" $(use_with numa numad)"
+	myconf+=" $(use_with selinux)"
+	myconf+=" $(use_with fuse)"
+
+	# udev for device support details
+	myconf+=" $(use_with udev)"
+	myconf+=" --without-hal"
+
+	# linux capability support so we don't need privileged accounts
+	myconf+=" $(use_with caps capng)"
+
+	## auth stuff
+	myconf+=" $(use_with policykit polkit)"
+	myconf+=" $(use_with sasl)"
+
+	# network bits
+	myconf+=" $(use_with macvtap)"
+	myconf+=" $(use_with pcap libpcap)"
+	myconf+=" $(use_with vepa virtualport)"
+	myconf+=" $(use_with firewalld)"
+
+	## other
+	myconf+=" $(use_enable nls)"
+
+	# user privilege bits fir qemu/kvm
+	if use caps; then
+		myconf+=" --with-qemu-user=qemu"
+		myconf+=" --with-qemu-group=qemu"
+	else
+		myconf+=" --with-qemu-user=root"
+		myconf+=" --with-qemu-group=root"
+	fi
+
+	# audit support
+	myconf+=" $(use_with audit)"
+
+	# wireshark dissector
+	# myconf+=" $(use_with wireshark-plugins wireshark-dissector)"
+
+	## stuff we don't yet support
+	myconf+=" --without-netcf"
+
+	# locking support
+	myconf+=" --without-sanlock"
+
+	# systemd unit files
+	myconf+=" $(use_with systemd systemd-daemon)"
+	use systemd && 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 \
+		--disable-werror \
+		--with-remote \
+		--docdir=/usr/share/doc/${PF} \
+		--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} \
+		EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
+		SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
+		|| die "emake install failed"
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Remove bogus, empty directories. They are either not used, or
+	# libvirtd is able to create them on demand
+	rm -rf "${D}"/etc/sysconf
+	rm -rf "${D}"/var/cache
+	rm -rf "${D}"/var/run
+	rm -rf "${D}"/var/log
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	use systemd && \
+		systemd_install_serviced "${FILESDIR}"/libvirtd.service.conf libvirtd
+
+	newinitd "${S}/libvirtd.init" libvirtd || die
+	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
+	newinitd "${FILESDIR}/virtlockd.init" virtlockd || die
+
+	readme.gentoo_create_doc
+}
+
+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
+	dodir /etc/sysctl.d
+	mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	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!
+
+	readme.gentoo_print_elog
+
+	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
+
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog ""
+		elog "The systemd service-file configuration under /etc/sysconfig has"
+		elog "been removed. Please use"
+		elog "    /etc/systemd/system/libvirt.d/00gentoo.conf"
+		elog "to control the '--listen' parameter for libvirtd. The configuration"
+		elog "for the libvirt-guests.service is now found under"
+		elog "    /etc/libvirt/libvirt-guests.conf"
+		elog "The openrc configuration has not been changed. Thus no action is"
+		elog "required for the openrc service manager."
+		elog ""
+	fi
+}