Fix install location for libvirtd.service.d/00gentoo file; bug #545828, bug #546168

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

8 files changed, 971 insertions, 35 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 561e1d230bac..4c2cc7049619 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,20 @@
 # 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.420 2015/04/05 20:47:47 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.421 2015/04/17 14:30:51 tamiko Exp $
+
+*libvirt-1.2.13-r1 (17 Apr 2015)
+*libvirt-1.2.14-r1 (17 Apr 2015)
+*libvirt-1.2.12-r1 (17 Apr 2015)
+*libvirt-1.2.11-r4 (17 Apr 2015)
+*libvirt-1.2.10-r5 (17 Apr 2015)
+
+  17 Apr 2015; Matthias Maier <tamiko@gentoo.org> +libvirt-1.2.10-r5.ebuild,
+  +libvirt-1.2.11-r4.ebuild, +libvirt-1.2.12-r1.ebuild,
+  +libvirt-1.2.13-r1.ebuild, +libvirt-1.2.14-r1.ebuild,
+  -libvirt-1.2.11-r3.ebuild, -libvirt-1.2.13.ebuild, -libvirt-1.2.14.ebuild,
+  libvirt-9999.ebuild:
+  Fix install location for libvirtd.service.d/00gentoo file; bug #545828, bug
+  #546168
 
 *libvirt-1.2.14 (05 Apr 2015)
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 9785a24b86c1..c85a52a3e51b 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -16,27 +16,29 @@ DIST libvirt-1.2.12.tar.gz 30710487 SHA256 eff5227f774560d97f0b44402a444e821c51e
 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.10-r5.ebuild 12924 SHA256 77b8a66d0232bcebba0c5556607c012bd7ce645ff6655e6901eb94c49d7eef67 SHA512 4c663373f21b65d5b70837ad81223a8aaed3efea63f3eb0ead90b317f361b33aa43ea30b351213c81227dfb094c17fec5136dd4e11d8627f5dcd3a7267c6669f WHIRLPOOL 8685fc2ffeb5be534e67071f7acbfde5162b16d145c623c714185724863d1b4d1181d67913bbdf6e150002f2fce97674cccfbe78caa12213e205e2566c8cc3fb
+EBUILD libvirt-1.2.11-r4.ebuild 12997 SHA256 966528fe4ae139e7074a414889ba7c395c28ea1bb96cb00f8c89f2074940de3e SHA512 c02f93901dee4b182d7e13ef5d1013d737f4bbfeb6d6c053c7d6e4fb8464aa18a8183a0c4920dffb0f8cd86f855674c60ca6daec0e0669c1c5e0826623ec5b69 WHIRLPOOL d6f83c8dbdc367e3b67c4974ff9023b0cb9450495c5400c56434a67590e20f6d7ea4070793146f7c30c2830fae95c3e0e120afefdd61d92f814eb471cb54c824
+EBUILD libvirt-1.2.12-r1.ebuild 13009 SHA256 4d893b278b0dacfe9ec589b7863d228452be7c1676e141300332986ba1609b00 SHA512 a41eadcbdccd09dea62076c36c0d250d0397fe0a78ff2045df3a889c6bf00842afb5b6b7b36bfa3f5dad7808d6d66960f1e0988a7fa025c1866bb34ce419fbbf WHIRLPOOL 1c1d8f7beeb5ac2247317c5416b6265cd4ed5b872c264820c1ecf91d8e7c7a13536984c27e2216ed2ef9e5657da10df8dd1f5c0dc1f04b6d45ac01dfb152f599
 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 27146 SHA256 9e0167e2448b467c3631e4fb8bb4e2f1f943c83d4ca49ae31f30a7d7a349cd3c SHA512 bd0766bb30f6c74f2f6b01e4da97490db07fa819957d48860d6520e07ed2f4870acad182bfd1d9fc757172ebab504786a645d5970388eb4d14d0db9c3bdfba3b WHIRLPOOL b60698345ed7e514855e36dc3c41b8437aeee9c59d243c19584e6c80440f9ed8ad94340fbe91eb8031511eb9b9bc764ffe451569b9127274a1b2859bc3ee8e4e
+EBUILD libvirt-1.2.13-r1.ebuild 13009 SHA256 feaefe8f181b4b1c44b58da5faa16ffcdaa9920ba19dd0b10be4ec85c8b9cece SHA512 977c472adf34f1abab49a93f9bd449424fd223b6ef910f38aace1e0c6798b86b7b3a019fe24f660ef17b432b155b83d58bac2ad9d93683b32f1ddcfdf8311df0 WHIRLPOOL d48eb692a320b31bb7d4906ba4452e21c5002a4be044b0355b8e63ea4f22baf4e1b023f383470e5c3af079741aa949a66c6bb0f812219dfe3728a0faaf4dedac
+EBUILD libvirt-1.2.14-r1.ebuild 13032 SHA256 694358a5c720c1165d8bc34f9aea0e435b403ed53477df5618b938f71a677844 SHA512 ab6c18766fceaee388c7b82ee80621f785fa0111f111469a8b6936acdeddc088b5163a728e8d4184ab3c0ca8a191fcab98851cc10ff164f631dbd29ab97bcc72 WHIRLPOOL cec5ccf63b1770b78d356a1c342905f29c4e4f3ff4a61ec3c0d7bc43f906cdbe17b9476f8ae5d0a3e992a92423afac591518de9e939a72aa0635d4a7f5e3275c
+EBUILD libvirt-9999.ebuild 13005 SHA256 d10ea2c75c5448859c634ecf17cb5312313fcd4623e88df0c495b5ea55e32173 SHA512 f54ff55b5d3112be1be26c00ad036c446c07bc04f6aa6438201808b7da0c5d6df085113d705ed1c79ea89cdd68d74a95cdec350934112cdc9e3d4814f949b148 WHIRLPOOL 29ecc5bd6f96e50b58a797373c4029e86ce3a029ea7f13e80e83c9cebee8c37e5d94022979b96c95d13ef5d97945e7fbdba23896338a3c4606fc2194e2a568a5
+MISC ChangeLog 27690 SHA256 0f5d9aa84f59bd43f9b7afa1773a14205438f14190a499aecacf1cb1cec609fc SHA512 a345dec6c9a2d483abdeeebdf00996ad952eafcf28cfec80e6fcdd5d5c200af63da31cec8611501382967c18c8ccd6e2867d29001940750b2bb7fb7eeb9895d0 WHIRLPOOL 8f74dfad86df34475d41e945b5c97fbe03f460e1b61a2c2b50624e5e94f0e364bbaab6ad363c348db3beb50247beef9bb45babdd3b0624cf34c0382d45611763
 MISC metadata.xml 3604 SHA256 90d98bcf32df9c4ff5d3fc90cdcac46ddc486efa9706b945cbf749d4a1ddcd30 SHA512 35b1fd9faa961efddec324d3721699068b9b2aefb49271f064b3930c9c246a71829f55566438754c34f294db9b8c2ad55386113a72ab11b31cbb604e4afe7816 WHIRLPOOL 6315f8a01134f62a1f7b9845f0e89624bb1edd713b4965a53209b199609ba4f510f0cbb4ee85f348947556cdeee27ab7ae7fcf52b1b9ed82176076d149c00116
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-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
+iQIcBAEBCAAGBQJVMRkTAAoJELhOzYlK7nn/buQP/RsITNB0mMO5SvppCWcHjNYA
+ir9KD/IvmA/pKCYtV/yl6zf+qqnQ7Op7PYKcA8nxk53mf+1NwPzgVD+acYDZ/3cQ
+8ELUabB66XvKxrsUsYjEx52BcoO/R1ImA5zhwd40w6GxWZZ3ucMN+mBWsCHsFm0v
+SQgatvot2WpykAuk0c0SCwrO6PCE4/wkLf4VBFlYxL04xhc11L8NmTAxj6eO4Hfd
+2sfxwihTI+4xAt9LjInzEvxnVqaXHKsnca2rN3WDlR0IKACE9yq3FfHUlqxr1KaE
+oJQhcCoan/6L7nJSyU/jBZO87oBacixGixCAaVxI9dkAo21C+6k2LKazDPlbXXac
+wfyzEhuLsteYXnoy1Npc/anq1GqjaZCTdYISEXvccDovJgUIJ940tTMLsHjg6I+A
+tR7lsxL53MXYfl8/EUFqPnDaxPk0gQonoUrRZDJgF8aV/cwv2RetUohXLfQcMQCF
+SEBiDrw218trZIfEDCyQw45mRlAIsRtIXNGUqbI35/zguhfoqq+rWBAIE78z+02B
+Lp+UBXJy9OyKhRrIynhVXdzBZQNdbkDuJy6tjcYf2fanmCZO9eAIKw0eHNezr9+g
+Img2f6hubx8JbpXx/LBsMKXB5sp206rsjgfyhUvUH12D+FndNFDl+CJ5B12NX6yR
+jOcXJzGMlDAGU5e1pobs
+=VR62
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-1.2.10-r5.ebuild b/app-emulation/libvirt/libvirt-1.2.10-r5.ebuild
new file mode 100644
index 000000000000..0405a1be1874
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-1.2.10-r5.ebuild
@@ -0,0 +1,458 @@
+# 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.10-r5.ebuild,v 1.1 2015/04/17 14:30:51 tamiko Exp $
+
+EAPI=5
+
+AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+inherit eutils user autotools linux-info systemd readme.gentoo
+
+BACKPORTS="20150127"
+
+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"
+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 wireshark-plugins 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: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 )
+	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 ) )
+	wireshark-plugins? ( net-analyzer/wireshark:= )
+	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-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
+	epatch "${FILESDIR}"/${PN}-1.2.9-fix-firewalld-configuration.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-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+=" $(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)"
+	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.service
+
+	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/libvirtd.service.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
+}
diff --git a/app-emulation/libvirt/libvirt-1.2.11-r3.ebuild b/app-emulation/libvirt/libvirt-1.2.11-r4.ebuild
index ab770c2696ad..813756bde0f6 100644
--- a/app-emulation/libvirt/libvirt-1.2.11-r3.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.11-r4.ebuild
@@ -1,6 +1,6 @@
 # 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.11-r3.ebuild,v 1.1 2015/01/27 10:42:52 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.11-r4.ebuild,v 1.1 2015/04/17 14:30:51 tamiko Exp $
 
 EAPI=5
 
@@ -399,8 +399,8 @@ src_install() {
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
 
-	use systemd && \
-		systemd_install_serviced "${FILESDIR}"/libvirtd.service.conf libvirtd
+	use systemd && systemd_install_serviced \
+		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
 
 	newinitd "${S}/libvirtd.init" libvirtd || die
 	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
@@ -450,7 +450,7 @@ pkg_postinst() {
 		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 "    /etc/systemd/system/libvirtd.service.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"
diff --git a/app-emulation/libvirt/libvirt-1.2.13.ebuild b/app-emulation/libvirt/libvirt-1.2.12-r1.ebuild
index 6691cb159495..62d7b782a54f 100644
--- a/app-emulation/libvirt/libvirt-1.2.13.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.12-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.13.ebuild,v 1.1 2015/03/13 12:38:04 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.12-r1.ebuild,v 1.1 2015/04/17 14:30:51 tamiko Exp $
 
 EAPI=5
 
@@ -400,8 +400,8 @@ src_install() {
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
 
-	use systemd && \
-		systemd_install_serviced "${FILESDIR}"/libvirtd.service.conf libvirtd
+	use systemd && systemd_install_serviced \
+		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
 
 	newinitd "${S}/libvirtd.init" libvirtd || die
 	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
@@ -451,7 +451,7 @@ pkg_postinst() {
 		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 "    /etc/systemd/system/libvirtd.service.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"
diff --git a/app-emulation/libvirt/libvirt-1.2.13-r1.ebuild b/app-emulation/libvirt/libvirt-1.2.13-r1.ebuild
new file mode 100644
index 000000000000..22097955c03b
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-1.2.13-r1.ebuild
@@ -0,0 +1,462 @@
+# 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.13-r1.ebuild,v 1.1 2015/04/17 14:30:51 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"
+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 wireshark-plugins 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: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 ) )
+	wireshark-plugins? ( net-analyzer/wireshark:= )
+	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.service
+
+	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/libvirtd.service.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
+}
diff --git a/app-emulation/libvirt/libvirt-1.2.14.ebuild b/app-emulation/libvirt/libvirt-1.2.14-r1.ebuild
index 57c7fdf98a8f..4626af653b45 100644
--- a/app-emulation/libvirt/libvirt-1.2.14.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.14-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.14-r1.ebuild,v 1.1 2015/04/17 14:30:51 tamiko Exp $
 
 EAPI=5
 
@@ -401,8 +401,8 @@ src_install() {
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
 
-	use systemd && \
-		systemd_install_serviced "${FILESDIR}"/libvirtd.service.conf libvirtd
+	use systemd && systemd_install_serviced \
+		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
 
 	newinitd "${S}/libvirtd.init" libvirtd || die
 	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
@@ -452,7 +452,7 @@ pkg_postinst() {
 		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 "    /etc/systemd/system/libvirtd.service.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"
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 31679cb95f23..7516d619b39c 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.72 2015/01/27 10:42:52 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.73 2015/04/17 14:30:51 tamiko Exp $
 
 EAPI=5
 
@@ -400,8 +400,8 @@ src_install() {
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
 
-	use systemd && \
-		systemd_install_serviced "${FILESDIR}"/libvirtd.service.conf libvirtd
+	use systemd && systemd_install_serviced \
+		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
 
 	newinitd "${S}/libvirtd.init" libvirtd || die
 	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
@@ -451,7 +451,7 @@ pkg_postinst() {
 		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 "    /etc/systemd/system/libvirtd.service.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"