add stable release 1.2.9.1; ebuild cleanup

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

5 files changed, 544 insertions, 86 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index f819a51e52fd..8cd039e1a945 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.388 2014/11/08 18:23:51 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.389 2014/11/17 20:02:58 tamiko Exp $
+
+*libvirt-1.2.9.1 (17 Nov 2014)
+
+  17 Nov 2014; Matthias Maier <tamiko@gentoo.org> +libvirt-1.2.9.1.ebuild,
+  libvirt-1.2.10.ebuild, libvirt-9999.ebuild:
+  add stable release 1.2.9.1; ebuild cleanup
 
   08 Nov 2014; Matthias Maier <tamiko@gentoo.org> -libvirt-1.2.9.ebuild:
   drop vulnerable wrt bug #528440
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 157b61784b2d..92a24afa00fe 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -9,26 +9,28 @@ AUX libvirtd.init-r13 3678 SHA256 5744e7392b0777d14142552237f517ff1fbf6c4734aff9
 AUX libvirtd.service.conf 401 SHA256 1cfb6f7dec5746364d9a4cccddb4b63f8ccd0ebf8bfaa000b13a09962ca24fac SHA512 27adbd104ea87e51d423b057392a0c6726692ad8ee9723f73dc4bfe8eb54069725d64883434424ba810d36992d404d1ba4afe6bcefb866d3d3d92dfd161c2b32 WHIRLPOOL d6b960b7d18bdbaf0ff6dc5ecf29e7d10e22fa7d16933a149d6287c007d864a0e0dd67048c25a038dd5f73c9ea911d2cd49bf21c072b0c7eab1e92be35d8b545
 AUX virtlockd.init 437 SHA256 0894a839f85dff6f97bde514437935f4c1589ba4f2cbd3e0efe28753698694a1 SHA512 3d7b366736fb98acd26577e29a3c00592e7be038634fc3b51891f557426cd9945bf08a4486f1d62aa91ce7dc7d6bf96d7e57ef06a3a0b4aceb55b9e9c9e9b2da WHIRLPOOL d633a1a7358dbf7bd94d70f44753c9c346adfc78537643e5f379cea017d20e1097998ecfaf87e47e4e0f9216d43a3053af24e3129ecfb8f110f5283a769f368f
 DIST libvirt-1.2.10.tar.gz 30029503 SHA256 5050f4cea3dd59d3eca25c3d3f16085e10d624ecc18bd35820cd3dac6f46c08e SHA512 9cd5d2a604769cf70e388c367abcde27ee8d6d7043227f17dd2cac92a467ea06547374e1d83c7b1ee4c5322d8b3d9e4cbb6db373efae5eaaceed1b1376cbd09d WHIRLPOOL 986c1fd0128101f936897c97a36d646b8893d9ee0a223d05b004d73408a2720aeb9bb5fe3e4a7c476947021b89d955fb4a1b3a64dfe8dfe0d30dbfe75487b8fe
+DIST libvirt-1.2.9.1.tar.gz 30173171 SHA256 7824638d674b1e3fa6b48760587d6ff6d3d466671e71cc759b3383a5a9c1a3a4 SHA512 113b321a8a3834d6e2e0d952942b681fe047cdb840e39866ad444e9e5f0a65f0140b31e65af8453fcebd541eb932c4470794a8bd7fc7c6e1e70be39d5d685929 WHIRLPOOL 28f1d1fdf904f9f05c3f6116bddf1b7466d431c1e11c6e0c738c69f5e35088581c5748de57980b9bc98ea18972f5c1492453f59aa427a311041cd7aeeec535c7
 DIST libvirt-1.2.9.tar.gz 30154430 SHA256 95931a5a52f451b9ab73d6a5ae11a5740e1ba69a66520c2a0cffc6068a7e8fc4 SHA512 e91367037622da17b5081ccf471e17d36f474596f19034b30e86f42940939340dc4cf455697e54bf9023005fc45cd9982a0f39d244373dd4d585fd7b9aee918c WHIRLPOOL 771025eb6fdda434f9413b03f6c6e0e8a36fd314eb650f913b695481adb71cff3a07ba19934857dcd468b6357c371ba3972a67b71c4ca29092c2094e482cb24d
-EBUILD libvirt-1.2.10.ebuild 13061 SHA256 4804bb54d0004985d81c481804a2194c619ddc5bc1c1ce7f95cd4e92f105a80c SHA512 8b1f46e1d90daa7d3079da724cf49c55c63a1e7ed146a4342f51586c6dccb427fc4dc20c50b53061668fa31aeab9b2c0d97e7bf304c9f79179d6502d8fecea0f WHIRLPOOL 5e063d2d7f41d8fae688853d6ade4a4287deae32b634b8bb5ba49407397506a7007b34a36b65796807b2f4be52c7313a0af0be5409590392f729836e161bf4bc
+EBUILD libvirt-1.2.10.ebuild 12583 SHA256 7d1acb70348e25e79aecc1978c5aaadf5071e3d4bef2a064c8f9e07d3226ea02 SHA512 83c701e4b2b98ef15d6f6d204345a353c8740860f1529a18ce45480286e1271e17f1c8e3eebdb5677d58b243179c251d80c4a3436e3722eaed4a536384d51128 WHIRLPOOL 63b77f7db9fded0b72fe8b731f8a8b8a34160245ecd7f8bfbb46992e8a13cb38527f37c1cb1b81173989630282349ff498b0a867c8e7ce37570af0c2d3fd659e
 EBUILD libvirt-1.2.9-r2.ebuild 13051 SHA256 a4f70a8d9a50abfd64a5b99feb2e393ca28b3f4138c1f0825391e615b372df20 SHA512 43dbde43a3e5818f067379cbf120a56e56db9e46b2a95e5ebb34318378a4476716d97810170761262030d09821b2c53c518a3e9df8e33413ca8b122158be0818 WHIRLPOOL 42e404845712101d44308968f78e0bb063a5f9f9452f8fdcd47f32fdc02f520cdfb2c68bcbc21ce4b5a3f9cfad1dcc95ea6d63bc3b22d53ac492fcee328a0aa4
-EBUILD libvirt-9999.ebuild 12390 SHA256 908462a1e21fcd3329dd2f92f8dc458d50e665b2a79c52abbf760e134751db7a SHA512 8a8801c57a2f0a4c10be21fc324e7f15426c1476fb84edab6553fb82022506a254dcba1dbd2ad096f1687eb94f0356907597559946e07c30fac01911d0896c20 WHIRLPOOL ec30fba829c0ab949d4cda1510681aff803b2b213901b52650a49c4406ed87acd2551a6367fd36513549dabf137f6c241cb778b9facce8b08ad0c3c27fbd8c78
-MISC ChangeLog 21969 SHA256 e53f6da1a1085fe575885d9a21521fab6c448fdaa6e4015984623aae30f14aad SHA512 7cb88d19006c6f1da85746050424876860c3ea14ef55fb35ad9f03210dd4cd7a349aaf30016088653284721e016b1cb800ba23a858843720ea17f2c4fbd12454 WHIRLPOOL d1837dbbd6b2fff65be725ed1fbd2ed5af0c08d82ef73ebacd4a03b93991dc3139f30f89cd75260164747f395239bc223d5545fab53f51ee094c94f472e4fb2e
+EBUILD libvirt-1.2.9.1.ebuild 12537 SHA256 7fcf4cc30e1124369c1a75b8ce50ffea98033a5915fbf223652fffb797f483f9 SHA512 f051975b75d86199968ae6c449df22d5bd3781957bdac5666c7ce602c120cc06f848ce0586f233ebf585f70e19e0d3c2ebfbf30b6bcfc6402af16f86b2444ad6 WHIRLPOOL 962d342561252fbdea29fad9c6da89ae4b65d244ec7790a8996ce636688809e4b38a701822f4bc5610f110cd7813ef01262e6b6a5eaa8485bc18b24fe2fdef1a
+EBUILD libvirt-9999.ebuild 12535 SHA256 9e533e4f5523dcd7e07756a1a103b06c3bbf22f57e54b139ce61168ae74491c6 SHA512 96a522cdea12a4b934ce4cc6739c2fc13ee3b5704acedcc7c5a6d1a89e5c0700cb362008101719733ac9dbbd061925f0436eb28eb451a46ad70f476479eae453 WHIRLPOOL 460e4e6a7bf5771c779bd2778bf45e2091a884bf707e2b1798e63a5c3040ead875dc0479d89c00d0525bc5bd440bb1b65ba49acd0f47de0f0e4b71e5c6bc5ced
+MISC ChangeLog 22168 SHA256 6541dac57ee4dfbbfbb206f2b857b9074c0bafc204ffadd61d7c8965600c36fa SHA512 0b328f5026f9868e3b60734a6151baa17f5c3262217e3293fb6ee0ea0e8b36a84c8c7996eade3e9c9373ded08a8c61116b274bcb31bce4a468bbc40bc0f383eb WHIRLPOOL a28dc2027c87183a5104649f8f7ecd0f90ecb916abc1303b8813588fbcfaafd26139779d48413f4cbab4aaf5b185f0b5a63948c8defc335714ed454deb35be15
 MISC metadata.xml 3736 SHA256 376b65feea8c2f85dccad2e564cc6111f2dc2de2a3b785a4c10af8c95c4920ee SHA512 93933d1ddfce67739e0647adce2f9253ae596429c794b73562737b508400a0fa7af93eae06808b088888b1d44f421ce4765cc6b56b9b5356140af80ca36bebfc WHIRLPOOL 7ef396db2e624c2798ba30ad4b8099237fb699c5e94cd1470ec6161a068f1e815930a87104545b4b98183784465a9a5f9dc051beb99ef1c5731e61f42f5c7381
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJUXl/AAAoJELhOzYlK7nn/69QQAKVB1TYrLV2c4/F13iAqe5e4
-QqLb+lA1TggAasUzcgJJ0MrDzF9+LVQES5529CPWvSEyaRoTvbEhTF/Ph7pk6MVK
-RLymi7LBJmT7ljuR/nPy3Aw7oGroFA+eJF7XqfdlrfzoyvWKYf3T5U5s0l3PCXBv
-NAoL3btJzXspM+oALniwjPR/N2Ep4uYM60ueJrIOmiGqdpXLqjlfancjl8Et+icz
-m+PlRh85usr9ghVIvB5dKJohNz7dl5l48l2JfTRtDPh3rhI7IU+xcVnXRC1vD90Q
-iBUqgjqEcuJzkhkYUNV3lI4zHx90+8qdrY67BXgW6fof2kcD0VrzVe1+mbXivZ95
-k4vVglEjO+XxhDMCmlYo0aPiIhIFXqA7kbtCGR0+hRCfewIZYF+J9W1ZqjKRZ1Wi
-NfNZr8qTJDsDSNtfn32UK5KuEZhLizO2hp6q0n3ppmsgq2AkBc5gXuIzcDQqgxsT
-A0JcwSHKRHbx67QlEjakr5Ybi1IX9d94VdyHHhTWzWEm65+R7t0R4c0KPwThsFaO
-WMZbA7bzVqi9CuKsMzHDJgBrP9xz2cei1VlpixYEIQjvF6zmhkY57BioioKtzlx4
-oTtCccY9e4YvyVCtdH/MWm8j+TQQWxFUPtAR/TyDbKvS0NDmdLE2+HvpHPIpuXM/
-nAJjFaMP4e2W8k2YIKyh
-=3uVz
+iQIcBAEBCAAGBQJUalRzAAoJELhOzYlK7nn/zJYQAOCfowP0pb0hHx3Jp0Zxji/d
+pd6ROpzOOkmuYY3/YY1IOPH9S7VMkv78ZgoVkif+aO5wsKeLsBT4YnP8PUTf8jP6
+6eAHBHscgjtMm+gXw4uxQ9ashF83B54dQvZU0Y0PbJdsHPvH82YLc22GIj5xlK+C
+iHv8wpFOtCd8iBlq8LtWLRG93nnhAbCDpXoWqLRsP6zT1Yt/KxkEPPliYI+1fz0U
+D2JCdm8m4/Pxz5n4kYphXGN1R/zoNKrScLHS7DvhCna72uO/W+1/LA0KEV7h22u0
+mJ29DfZ4ctW3gT7GWLYaMh1jsiAiv+HQfyv/wdESCR2N+EP4qdaZKj+VK2UrodP4
+5iHw8yyf30GMU+RBKW0SasEVz+f5dBHg0VCPm9PfbG7h3X+ZdOWP0TCsodgHZaoc
+R4bM6UiHuul80afVEsbhRLEpXdTVnlHrmnluG3D+ItiMXlKSofDaf2DvCIPACaHR
+H6Als9GJJpAwXnfUE0YVmmF0ztkRaOdATc4rpVupOq9gfyEucxbGRKuGup1X0XCX
+GJACVApRWyJfDTEzJfaAFacMu+MHVs1IcM2rN9DKogBSXhOPNRIK9ZR7jlVCSpwF
+sUcGuY7R6lTAm76pS/1DwjNy8DlbVxUbxS7IEQBXUJZrCEjE/j32wMfMMcXJjFrY
+R1x05GpsGJsW2aRm8/sE
+=MgoY
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-1.2.10.ebuild b/app-emulation/libvirt/libvirt-1.2.10.ebuild
index 246752893b0e..6934ef7434ed 100644
--- a/app-emulation/libvirt/libvirt-1.2.10.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.10.ebuild
@@ -1,10 +1,9 @@
 # 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.10.ebuild,v 1.1 2014/11/06 22:36:08 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.10.ebuild,v 1.2 2014/11/17 20:02:58 tamiko Exp $
 
 EAPI=5
 
-#BACKPORTS=062ad8b2
 AUTOTOOLIZE=yes
 
 MY_P="${P/_rc/-rc}"
@@ -12,24 +11,26 @@ MY_P="${P/_rc/-rc}"
 inherit eutils user autotools linux-info systemd readme.gentoo
 
 if [[ ${PV} = *9999* ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-	AUTOTOOLIZE=yes
 	SRC_URI=""
 	KEYWORDS=""
+	SLOT="0/${PV}"
 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}"
+	# 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
 	KEYWORDS="~amd64 ~x86"
+	SLOT="0"
 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 wireshark-plugins xen \
@@ -103,7 +104,7 @@ RDEPEND="sys-libs/readline
 		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
@@ -116,8 +117,8 @@ 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
+	bind-interfaces\n
+	interface or except-interface\n\n
 Otherwise you might have issues with your existing DNS server."
 
 LXC_CONFIG_CHECK="
@@ -206,12 +207,8 @@ pkg_setup() {
 
 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
@@ -251,92 +248,90 @@ src_configure() {
 	local myconf=""
 
 	## enable/disable daemon, otherwise client only utils
-	myconf="${myconf} $(use_with libvirtd)"
+	myconf+=" $(use_with libvirtd)"
 
 	## enable/disable the daemon using avahi to find VMs
-	myconf="${myconf} $(use_with avahi)"
+	myconf+=" $(use_with avahi)"
 
 	## hypervisors on the local host
-	myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
+	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)"
+	myconf+=" $(use_with openvz)"
+	myconf+=" $(use_with lxc)"
 	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
+		myconf+=" --with-vbox=/usr/lib/virtualbox-ose/"
 	else
-		myconf="${myconf} $(use_with virtualbox vbox)"
+		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"
+	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="${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)"
+	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="${myconf} $(use_with udev)"
+	myconf+=" $(use_with udev)"
+	myconf+=" --without-hal"
 
 	# linux capability support so we don't need privileged accounts
-	myconf="${myconf} $(use_with caps capng)"
+	myconf+=" $(use_with caps capng)"
 
 	## auth stuff
-	myconf="${myconf} $(use_with policykit polkit)"
-	myconf="${myconf} $(use_with sasl)"
+	myconf+=" $(use_with policykit polkit)"
+	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)"
+	myconf+=" $(use_with macvtap)"
+	myconf+=" $(use_with pcap libpcap)"
+	myconf+=" $(use_with vepa virtualport)"
+	myconf+=" $(use_with firewalld)"
 
 	## other
-	myconf="${myconf} $(use_enable nls)"
+	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"
+		myconf+=" --with-qemu-user=qemu"
+		myconf+=" --with-qemu-group=qemu"
 	else
-		myconf="${myconf} --with-qemu-user=root"
-		myconf="${myconf} --with-qemu-group=root"
+		myconf+=" --with-qemu-user=root"
+		myconf+=" --with-qemu-group=root"
 	fi
 
 	# audit support
-	myconf="${myconf} $(use_with audit)"
+	myconf+=" $(use_with audit)"
 
 	# wireshark dissector
-	myconf="${myconf} $(use_with wireshark-plugins wireshark-dissector)"
+	myconf+=" $(use_with wireshark-plugins wireshark-dissector)"
 
 	## stuff we don't yet support
-	myconf="${myconf} --without-netcf"
-
-	# we use udev over hal
-	myconf="${myconf} --without-hal"
+	myconf+=" --without-netcf"
 
 	# locking support
-	myconf="${myconf} --without-sanlock"
+	myconf+=" --without-sanlock"
 
 	# systemd unit files
-	myconf="${myconf} $(use_with systemd systemd-daemon)"
-	use systemd && myconf="${myconf} --with-init-script=systemd"
+	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
@@ -355,8 +350,9 @@ src_configure() {
 	econf \
 		${myconf} \
 		--disable-static \
-		--docdir=/usr/share/doc/${PF} \
+		--disable-werror \
 		--with-remote \
+		--docdir=/usr/share/doc/${PF} \
 		--localstatedir=/var
 
 	if [[ ${PV} = *9999* ]]; then
diff --git a/app-emulation/libvirt/libvirt-1.2.9.1.ebuild b/app-emulation/libvirt/libvirt-1.2.9.1.ebuild
new file mode 100644
index 000000000000..fdc8ee07f796
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-1.2.9.1.ebuild
@@ -0,0 +1,449 @@
+# 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.1.ebuild,v 1.1 2014/11/17 20:02:58 tamiko Exp $
+
+EAPI=5
+
+AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+inherit eutils user autotools linux-info systemd readme.gentoo
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+	SRC_URI=""
+	KEYWORDS=""
+	SLOT="0/${PV}"
+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
+	KEYWORDS="~amd64 ~x86"
+	SLOT="0"
+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_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
+
+	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
+}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 7361f0fd0c8b..c6289d68a42e 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.66 2014/11/08 18:00:44 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.67 2014/11/17 20:02:58 tamiko Exp $
 
 EAPI=5
 
@@ -15,17 +15,22 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
 	SRC_URI=""
 	KEYWORDS=""
+	SLOT="0/${PV}"
 else
-	SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
-		ftp://libvirt.org/libvirt/${MY_P}.tar.gz"
+	# 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
 	KEYWORDS="~amd64 ~x86"
+	SLOT="0"
 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 +qemu rbd sasl \
 	selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen \
@@ -214,7 +219,7 @@ src_prepare() {
 		) >.git-module-status
 	fi
 
-	epatch "${FILESDIR}"/libvirt-1.2.9-do_not_use_sysconf.patch
+	epatch "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch
 
 	epatch_user