version bump; fix dependency wrt 519316

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

4 files changed, 469 insertions, 19 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index ce67b450f74e..1e2ff505f436 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.369 2014/08/12 15:25:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.370 2014/10/21 18:27:48 tamiko Exp $
+
+*libvirt-1.2.9 (21 Oct 2014)
+
+  21 Oct 2014; Matthias Maier <tamiko@gentoo.org> +libvirt-1.2.9.ebuild,
+  libvirt-9999.ebuild:
+  version bump; fix dependency wrt 519316
 
   12 Aug 2014; Agostino Sarubbo <ago@gentoo.org> libvirt-1.2.5.ebuild:
   Stable for x86, wrt bug #509858
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index f6d0dcdc030b..eec71e1cd4e2 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -9,27 +9,29 @@ DIST libvirt-1.1.3.4.tar.gz 26646511 SHA256 d2d62f55e925f38923339c79fb58dd0e2509
 DIST libvirt-1.2.3.tar.gz 28605530 SHA256 b489d1a29c6166643d34b72795a89b03c6ac775cdaeadb6aa86fc1a982c02e31 SHA512 5ff85a98a0c62229d0ab8125d20fce982f8497d20cb89758bc37f475d7a5d59caa6d962e6c2313e1c494ca1648a836fcad253ceaccc34cc0060135470be3db5b WHIRLPOOL a431ff4584abed3454f30811b3673c0268f5d172d26d768c3157f1eddb8e242c084e7d81b9ea4c6fabd8f42a424cffae81b4695f475a8e6173a7710605a79f02
 DIST libvirt-1.2.5.tar.gz 28829671 SHA256 8ee97de3435b823ad2bc40a0b3c395efe2184ae748a92e2211fbe9393939ed45 SHA512 5ac109ebe9ddbb6fe122843d04ca3d703984fa67d3c62b294edc03da07ba527970eae4f12dc885f9ea78f4c711cdce512fa4ca4d3677f5f17892cc3b48e1562c WHIRLPOOL 806e9d16df9aa212a04fda4955a9473bd5338f5434312c3265776a4b54ba02e8971e006b2233a4431cd4146488c15b84d7ad7103c5be5ca35e8a9dbb70596acb
 DIST libvirt-1.2.6.tar.gz 29346718 SHA256 38a224559a1d04e5d4163c5c1b810df1f29804ebbb1f057d4abcb41a9e5d5dea SHA512 218a87c20706e0c093973ef983acacb25481603ac3bd2224d770b4a78821274a787588fd0147231bed880838475f9c540ed4b1e98dab61a573333ebe937208f1 WHIRLPOOL 165044f87a991a38ca97b46f4bca3c89b1142e075e6414c27a6cfd6320691c4c8f9bc30f890179e13a8e59ce971894224c5d0f423167db3bea5f90c45461a50d
+DIST libvirt-1.2.9.tar.gz 30154430 SHA256 95931a5a52f451b9ab73d6a5ae11a5740e1ba69a66520c2a0cffc6068a7e8fc4 SHA512 e91367037622da17b5081ccf471e17d36f474596f19034b30e86f42940939340dc4cf455697e54bf9023005fc45cd9982a0f39d244373dd4d585fd7b9aee918c WHIRLPOOL 771025eb6fdda434f9413b03f6c6e0e8a36fd314eb650f913b695481adb71cff3a07ba19934857dcd468b6357c371ba3972a67b71c4ca29092c2094e482cb24d
 EBUILD libvirt-1.1.3.4.ebuild 12247 SHA256 5e21dcf8f227d56f3a50580ab199d1bb7c1727d6f73bc72ab891151c3fdf27fe SHA512 1f2d3606fa279d22264e4c37102f79539e5fe48568749501504df6d66009578001df436d5d23df37cf5df28fcbbbd9e97b9531ba547adc5e1f98a23d1173c273 WHIRLPOOL 64035eeacb9d8e9bdfae0f5baa9332bc4e970225156162c7852dec22a615ca2605ea8f77ffec4491b98b3be47fdd9549139d32d8064a421a43d84c605fc45038
 EBUILD libvirt-1.2.3.ebuild 12344 SHA256 ea672a111da390ea87f463195d6f2b0a1dfa514f4595f531e712ffb96fe2e217 SHA512 046787417e0742272dd3a9c55ac420645ae0e6675e3e24137de43c224a20cb689b3235c6eb3b420a43fa162104070ff117343a37b15cb0f0aa67d14d275b719f WHIRLPOOL 456a3fe6243ff57f066e70054bc6be5daab8c336991966a5e5b28cde26bd4a3a25c78bb43af240e58d71803e73bfd368f400198eb09fab7d40252da13cbc8c6e
 EBUILD libvirt-1.2.5.ebuild 12524 SHA256 f45e8efe21d9219b267e2e00930b9ef04f7fcb8eaee3b5a24026984ac9b8def2 SHA512 c4e78c798fefa0ec544fdc32e17721e88a053510adf022a4c3386576b3567743394c4e12816b4ff2f92da11b581a1e1ec099536b974131397306b6eaca83ccf1 WHIRLPOOL d1061ac10a3df4756966f8a7b03daf60dbb4ab616b0402976ee1b58bd90904ac5cbe9e78dfe256629e0969101f5aa248cb6d1cdddc35f23e15748b32da2a205e
 EBUILD libvirt-1.2.6.ebuild 12569 SHA256 d79ba094e1f4bbfeab9b5de614710c9d6639d57a1200aa470571454b8f1e1b06 SHA512 7d0af05c3e2a2a9e162633b246f2e1f01fdf73273b401d032cc2bd669ab20433632af64011b8426189ad38cc589b4a6b3e48d9d0f877d85ae6ee49c7e9574631 WHIRLPOOL 261de1c52541c947c464b783eed8fd1cf5dc9139cae8c3ea9abffe8f1b3a85bf694da30b2d9b86e570f0654b2d30bccb1e2eee12fbec0d9d7ab677fa9ad3cedf
-EBUILD libvirt-9999.ebuild 12525 SHA256 a659d7c403dc8e4b17150c5a8410763b8f20f8b61624f6ad213df6543f9f51f4 SHA512 a37fec113402b3b293fd139979bc3c85225c255fec448f0bac4f262b4a2a1ea51593edce13d6d4c1770387db3ac6e1f209769a6c581805d71fa3e4cb7d485643 WHIRLPOOL eb104977f08628d180a45430b75beffbb616f40bbdf9499b1de3d96b7ff8ffd6736375797042cdf000cc16dd2d4602f514a42f1ad7200058c94193d5d627ee7d
-MISC ChangeLog 18904 SHA256 ac86b8a118414843005f011772fe637bddd526579ea046e6c9c23124d0aeb32a SHA512 f50991c57f484123678b5b16169a218bf9e771f73a6132790e4bd3472e41c2010e0ec8c82fe09984900c0cc69fc2f884fb60a795914931b632f05151f0e93b3c WHIRLPOOL 8718ecacce3fdb523181bd081c90bd6c8e1c2d90abea5df6db610397290fb6633785409b8a3e1ab5fad133f07d1803467bd982a88aedd72f55bffb50c3f6056c
+EBUILD libvirt-1.2.9.ebuild 12537 SHA256 8d2418e9043663a01148c22fa57a8833abada5f97c1212b26de419603b1fc890 SHA512 fc065aa2459f1507b35d39ada9743c2e72bb0af0bd44aedbd3805d1d8a2d59916d04b41b0b8ec8d3b974ff7d75cb37cbab04b23a66e84ef329c70d74d8cc2029 WHIRLPOOL 62f6acc77a6baec870f5bef260545f9b7b77d1f4245d92908dac30f1f65d67809a2ba9b1521dfd4997f4d1cb2fae200846f44c2c3dd46f4cbcc7058a10b54909
+EBUILD libvirt-9999.ebuild 12533 SHA256 07831ae7fc67eafd271ad7ad31a533548d341be869c800001644bb66d51c6f34 SHA512 27b2aba10bce66f4f1e5d06d9ed53d477a8ff31e9997d77d4443287e4f177bdd82ea86c8d43ea8c9f6841a9fd02e049fd2fa34b2043c2ec20919c68233a50689 WHIRLPOOL d511856f543a4d4126edcfed476b29b445471f04487a5e1c20d960e739d39227ba06ff094ca53e70a635ceafab4ee048d4cb035dde7e2a203e37864c24a9367f
+MISC ChangeLog 19076 SHA256 e397b366be7daef5fd687a98d8cf7f5f09d045eb5c90722b254b5d43289e0aba SHA512 a08c2ceebf19cbbb4de6636e506c641e56168ef31055ad259d6035639a6aabda1a797949d3e38c27d829889f764fa11b808490c328b31d9d30c0cef872f097fe WHIRLPOOL 5d3bbb144fe856faa346bb62f9c0336aa2f509d767de49ee818c458a707c32beb517e3afcaa04cb1dfaba92ac399a47e40e1504c85c5c4fcdceece551d1db527
 MISC metadata.xml 3447 SHA256 39904bed8984cae6dcd825a88a5c28e2692d47fd13da73f5041b58e254e3b350 SHA512 d0972e6eeb32de75ca14c183873e59f87948f621d873cfeac3e930b63775fd2b8b776fdc482b9dc8c4bc2ee24ee45a52e35cdbf8adec30881ddbd745f249a312 WHIRLPOOL 2591d99b26d2ce784112a862b8362ef2a738a557bb2f712558216cf25b6680ec77dca9f5ec5696f4a949139a6de4e7e9ce8c0bad1690282ca169c28d218e5b6a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT6jHpAAoJELp701BxlEWfW3YP/2fbg407/6U1mnoDi9i1y9rY
-L1KhoogtVLF6JL0mvm/+FAR0ILyFKlCyH4Iuyyv+wK+xP7vrA7j0ydw7Ue0jHoG7
-2P9mEhiNIBMzq4NUu6XfL0EJszcXVhmVYmxArbMFg6mQRLWXbUeGEOsM0dzrNksU
-jGr5l+DEG9AoGOxbGtT4NsoRpbyK8IqR6Jszgj4oaaXXeJgXjZzk1YSCFa73UN1k
-WLoDMks8wx3bsF56eujCHp+THN7Q46mnXAhkuM94C8GAL89DjfXd0DNzhrY3DK4Y
-86psS3WjfGTJeoGmdI5p+SnSqNUOxtFfD8Y5ArMZSYO2e6JpRMSlyVwcwMqPGmsq
-TMWVa4j6b78Qvq0ECDFIPkvFDvQCNuc1WWy+F6GQz+A/LdZ2LGAPwHyzknxM0oH/
-K2t0fF3p6BaWQjdnZHCgkDYg4VQIU0H8ueH/qBnftaHGCyhK+IZS9PzH0Dh+lLod
-fHE/2MRA4udilvyBpO/we4LrviWVd1QAIG4/yNHNErED+VlA3/lv3toMUaRLrzh7
-9DWc4dQcXxN6My4oRoKFVI/czS84ROJVVpBGTQPUoGZFcIf4TOqct0UhRcGD/7Mc
-Y8ONrz9UO8SfbA33qxqdDpE5OUMrTnfG0MFmJ0ZVc3MiELTI5Li7Z6en7+LcwNE+
-aphUBlij83oQ9VdqZGdp
-=KNkw
+iQIcBAEBCAAGBQJURqWUAAoJELhOzYlK7nn/pWUP/jNgbhIKM9QLqdkLGB/Uupp2
+Q2liYIZxchPloXoCoVUBBjB4IplE4+uUoymplP3ZL+IW6LzUWLPosfU57PDpqxhW
+s5gejkjdDr/GgoQvJUnN2IkkpsYAcDOPVtwx0KnlLuVV14Qn64zqszxExWGf1OR8
+jrz52j+h39pu1iww6+WYMJVZjnv+pA0FXcE2A62MzNgTx56Hjj14GxzBIGV4IFGw
+nC2OeavKHIqfEFpUNjKcg1gjX7X5aPWWUCja3rZKk/V6LHObh0DRa7/Oar4RPJ/p
+hq8UxIkjJiKzMqzA53LpBMfLzr6I/To1LLXG+GywgDiq4QhZbRFsJ/4dsnSiOsNq
+TBQ3Q3icXu1U/48QoWd8UkH9/kXTDY8CiR2CPabdr8g+T2Oqn4TSecfgkmYsyrwx
+Umi2sNvZZaD7hOejglHUL0aAck7e0X2NqCLZ19lOmWSzHLHbwCANJdp8oOm+avB1
+x1LDC3w5KTsJ61Ry1vypmg3283iFhi4x00WPb6kH2wBwtZJecZ2LGzxLzwEVTPAh
+o6zr3++xDS/FYhq26f47caCZRI5VWpdUBy9UI9724uGUQD/iQmz9UEsVQvOK2ZLt
+2X69KeZuBh/UIUQWCSAJNYsz8b+DFCO68S+rHt+y5exZ+K8OFSISRSvNMlSvgZMC
+KeqcvRFYM7g4bZ0YfXDu
+=wTfo
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-1.2.9.ebuild b/app-emulation/libvirt/libvirt-1.2.9.ebuild
new file mode 100644
index 000000000000..21e3f31212d0
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-1.2.9.ebuild
@@ -0,0 +1,442 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.9.ebuild,v 1.1 2014/10/21 18:27:48 tamiko Exp $
+
+EAPI=5
+
+#BACKPORTS=062ad8b2
+AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+inherit eutils user autotools linux-info systemd readme.gentoo
+
+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/${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"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="audit avahi +caps firewalld fuse 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
+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? ( !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 ) )"
+# one? ( dev-libs/xmlrpc-c )
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-text/xhtml1
+	dev-lang/perl
+	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"
+	[[ -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-r13" "${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)"
+
+	# 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"
+	myconf="${myconf} --without-wireshark-dissector"
+
+	# 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} \
+		EXAMPLE_DIR=/usr/share/doc/${PF}/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
+	newinitd "${FILESDIR}/virtlockd.init" virtlockd || die
+
+	keepdir /var/lib/libvirt/{boot,images,network}
+	use qemu && keepdir /var/{cache,lib,log}/libvirt/qemu
+	use lxc && keepdir /var/{cache,lib,log}/libvirt/lxc
+
+	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
+
+	# 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!
+
+	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
+}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 324368886c13..6e9a1902f373 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.57 2014/07/31 17:06:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.58 2014/10/21 18:27:48 tamiko Exp $
 
 EAPI=5
 
@@ -94,7 +94,7 @@ RDEPEND="sys-libs/readline
 	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
+	virt-network? ( net-dns/dnsmasq[script]
 		>=net-firewall/iptables-1.4.10
 		net-misc/radvd
 		net-firewall/ebtables