Update live ebuild to latest iteration of the ebuild

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

3 files changed, 38 insertions, 37 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index d0f1de4fab2c..ebd36dc7b538 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.299 2013/07/30 13:17:51 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.300 2013/07/30 13:22:46 cardoe Exp $
+
+  30 Jul 2013; Doug Goldstein <cardoe@gentoo.org> libvirt-9999.ebuild:
+  Update live ebuild to latest iteration of the ebuild
 
 *libvirt-1.1.1 (30 Jul 2013)
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 0596d2765f7c..e3922967137c 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -16,19 +16,19 @@ EBUILD libvirt-1.0.5.2.ebuild 12185 SHA256 42e08f7da2c8179ffc4a4e34700d4c62d35fd
 EBUILD libvirt-1.0.5.4.ebuild 12188 SHA256 8e09a74393de564cb8210ee08d3fbb7c091eec5ad8389538a9db82f3858bf8d7 SHA512 9af9015afae592b9d0641a8238deab05564afdc1621e6f03aff9ed150f18403e9f8716da889b10385023448137c14feab44594967e5c1d7a2a79d881ab968d9e WHIRLPOOL 27513e3c89d24ca0984079000cc8d7a0da4a5f5becaaefe44a933c8d4e3202e0cbe44f83e5575c8c89534d0c8a058b7f3d6f7df7555c07d144df5010926f239a
 EBUILD libvirt-1.1.0-r3.ebuild 12053 SHA256 887e6fdf342cec0e03ee75fad4b7ea699ff94a9841b3435a3204798a903c2796 SHA512 462b8d09a27176232faa2ac75fcbef92fb88af9bcf464c11f95cbdd22b3ec8e2590d72a46e33a03d40e2ca26babcac9aaff364283f87e2543a3429394a233a39 WHIRLPOOL 3bcfe89ea18c29042eac1f0ed8441f1ec7caa3808928d40fc5edd89f72b17c52f003424161bc927372d9deccabe3455d43d157af0ba607a341b0b6f90b0d44c7
 EBUILD libvirt-1.1.1.ebuild 12070 SHA256 a415c55edb9195fa85f64746071a70bddc92996dd194f3cf8a0a48f050646452 SHA512 1234cb2619101abd9776ce72ff773925a10f88516eb07f5048de0e38fea7d588ddb4b9cea3e29ca9c2e47bf7c3b841a5ca5168c8737ffeb2fedff384ae8c2569 WHIRLPOOL c10e5c024dcfc0c6f52a8ff1042befd394faeefb402187e1b7c72cae358854ecc5bf4b941574bde8b9d63efb0a61508f38c874984607af05c97c3afc990b9655
-EBUILD libvirt-9999.ebuild 12105 SHA256 76709a5ecd8cead07f1a596f4875a55f828047673361334047c33aea331b8463 SHA512 596b9ab9ed3fba45d7a518e1340eb81ac6f6aebebe67ff23e3e624f90fa0b7ce87c03517b9eb3e693a1f59db3c14fc2900f9a7a0876c35a1dcdc90a58e926012 WHIRLPOOL c5338f9b9fb26de8319bc772e728eaf18ef8b9c4b4423f2317d9b58a4bb596a488dd511c61cf0c0dd8a8b4971618d41ed4e2ab815cec01eacf9fe53da8d6a3fb
-MISC ChangeLog 8445 SHA256 152da34839bb300f386022fd2cec8d6135c01200b90419665fcf4e9f7eddb5d8 SHA512 6063e6f788219163f51030f897dcc2849e30c4f9328aceac8918b96b2a4e4b88619571bc2670db198a41d02d4710e615e241ed775e5f2b7fcb52ee5d6fae6f0a WHIRLPOOL 337d8c3cc558764ceb5d6cd984f75abbb35e298755435d10e96e8e3acb17bc8653551915bdbbedc6cd1e0e994e0922673165dc28b42322a175011086bb850d37
+EBUILD libvirt-9999.ebuild 12070 SHA256 decc26a78a1b8d5e69d8277120fc48eb808bea39b0ab5f7635a41c07bb1aee3d SHA512 16466c7d090f9fdfd6bb1c955363dada9de86633f2129281f50a6654f17dbccc657e8690ac57e252a05c9effc46952b65249a3e1fad1f56fde0702cae04b05c4 WHIRLPOOL bcfc1a72c7016709bad31f0f7a55091abc09d1826439a2578cb1f298b6a73536739b34d0a0f8fed6ef28c23432790108f7e99e2149f95efafca3c43ce1ecff7e
+MISC ChangeLog 8572 SHA256 304d787563959d2bf85e68264ec91b347fa2a6fd7dbeb42df85cecdf8c258f71 SHA512 7f139441f9373e4e17cca5e01067ad609efb9255c5629ba1bdab546e8e0efcf348bc58bca8e23c312fc675db1fe0c1d8530f0f9471cd820c0e926fc2b205827b WHIRLPOOL 96fb7a502f7bb16e0caf5546321ed0ab389f151afb465af71a8fd3c5cc9a55a14c8b0141840a8cea6a38bf6cfd1afe3bfe20a3cdfcefd88b15b96cae02af340a
 MISC metadata.xml 3534 SHA256 8678edfd233eaa04266d7e15f71102fb45d1e4843697ba0cd04fe57b45dbb6c6 SHA512 e4b2cc5f9001697b784034ae6e58fea39e9fdc223192772592bcb671a4e1436186ed7757fc72993ee81c1e4005502fbb8c0a2d4588666a186d42024a98c052a2 WHIRLPOOL 9f32ac2763d17e5204da7396eae2a8c79c63e1e82b4a1035c86d93c029902159d3f5697aad86b7307b6e8acee0a4f0f02023d0e5e824a471cdad80a5cebc6886
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQF8BAEBCABmBQJR970DXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJR974nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDMDRGNEJFMDZEQTJGRUY3NkI4MEM3NTlE
-N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prvQtkH/RhNzhROh4GDHiYESrMnIwmg
-vJd0Z4wJuhHTbeyL5jrHjEsnsc/xjeGXZZuWpLwozIt30gg5etJlYBEOSTmrT0eh
-VJSybWOvujkQ1knF79ZODlzr+aWUO/WaHfeRF9rd7k6tF/nQx/i3nFRmnLucEAsW
-O3MZmafEHNxzzUGr2B8SeokrC73l4PpV4KsrCoKLjaOBY+pOAE/z0S2X7pTuyp/0
-Wxqx9Cuh1D5Li10ZdfhXLyuuTKUMNg5rBF53IRJOV8il19CTLMCl8KdEJZ7dMAJ0
-j1K0WLsBSmvLHdl/tAnzqVisChWp0TC/6TrKXKTHm7L+CP4D4h80MlK5xAXreb8=
-=HFON
+N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prvpCYH/ijdI5WUOBiapaRCetZNeCoq
+dlVm7sX+Xv2uXDrTrJe7/Vir14aE7Y64+JQM4Z4Yso5GFjfJAfsIuN0TW56QoWDP
+g/ShmxqAkWn3bBtF52yIliaxbDwuVj5r2f79jexl7aRA6/wy4GCKeBox45Xqvog2
+jrseo6nGmaOsxF8wMzXCcqwO1MXbYBczD3lemJV+ibPndTh4UBXHjq9JWHBce/zN
+5z8PMNH2Xd+qLod+nxAf0Nx24aJMw7+tAu7iMgmjqRjrfu7iLE2BYzxqanWH4czA
+SNQO8PMR99yNPvSSDuAhX79pdpZ261VP4gTfmOV1ns8ViUXdaUKuEIn7IEtDVV4=
+=+OeJ
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index e294228e2d60..fa6dfd4af5be 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.49 2013/06/09 22:42:04 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.50 2013/07/30 13:22:46 cardoe Exp $
 
 EAPI=5
 
-#BACKPORTS=9bf6bec4
+#BACKPORTS=cafcec2f
 AUTOTOOLIZE=yes
 
 MY_P="${P/_rc/-rc}"
 
-PYTHON_DEPEND="python? 2:2.5"
-#RESTRICT_PYTHON_ABIS="3.*"
-#SUPPORT_PYTHON_ABIS="1"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 
-inherit eutils python user autotools linux-info
+inherit eutils python-single-r1 user autotools linux-info systemd
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-2
@@ -34,9 +32,10 @@ DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm +lxc +macvtap nfs \
-	nls numa openvz parted pcap phyp policykit python qemu rbd sasl \
-	selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc"
+IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs \
+	nls numa openvz parted pcap phyp policykit python +qemu rbd sasl \
+	selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc \
+	systemd"
 REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
 	lxc? ( caps libvirtd )
 	openvz? ( libvirtd )
@@ -46,7 +45,8 @@ REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
 	virtualbox? ( libvirtd )
 	xen? ( libvirtd )
 	virt-network? ( libvirtd )
-	firewalld? ( virt-network )"
+	firewalld? ( virt-network )
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
 # gettext.sh command is used by the libvirt command wrappers, and it's
 # non-optional, so put it into RDEPEND.
@@ -85,6 +85,7 @@ RDEPEND="sys-libs/readline
 	)
 	pcap? ( >=net-libs/libpcap-1.0.0 )
 	policykit? ( >=sys-auth/polkit-0.9 )
+	python? ( ${PYTHON_DEPS} )
 	qemu? (
 		>=app-emulation/qemu-0.13.0
 		dev-libs/yajl
@@ -108,8 +109,8 @@ RDEPEND="sys-libs/readline
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	app-text/xhtml1
-	dev-libs/libxslt
-	=dev-lang/python-2*"
+	dev-lang/perl
+	dev-libs/libxslt"
 
 LXC_CONFIG_CHECK="
 	~CGROUPS
@@ -151,9 +152,6 @@ VIRTNET_CONFIG_CHECK="
 MACVTAP_CONFIG_CHECK="~MACVTAP"
 
 pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
 	enewgroup qemu 77
 	enewuser qemu 77 -1 -1 qemu kvm
 
@@ -165,11 +163,11 @@ pkg_setup() {
 		gpasswd -a qemu kvm
 	fi
 
+	python-single-r1_pkg_setup
+
 	# Handle specific kernel versions for different features
-	kernel_is lt 3 5 && LXC_CONFIG_CHECK+=" ~USER_NS"
 	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"
-	kernel_is ge 3 8 && LXC_CONFIG_CHECK+=" ~USER_NS"
 
 	CONFIG_CHECK=""
 	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
@@ -305,6 +303,9 @@ src_configure() {
 	# 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
@@ -343,8 +344,9 @@ src_install() {
 	emake install \
 		DESTDIR="${D}" \
 		HTML_DIR=/usr/share/doc/${PF}/html \
-		DOCS_DIR=/usr/share/doc/${PF}/python \
-		EXAMPLE_DIR=/usr/share/doc/${PF}/python/examples \
+		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
@@ -356,6 +358,8 @@ src_install() {
 	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
 
 	keepdir /var/lib/libvirt/images
+
+	use python && python_optimize
 }
 
 pkg_preinst() {
@@ -371,12 +375,10 @@ pkg_preinst() {
 	fi
 
 	# Only sysctl files ending in .conf work
-	mv "${D}"/usr/lib/sysctl.d/libvirtd "${D}"/etc/sysctl.d/libvirtd.conf
+	mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
 }
 
 pkg_postinst() {
-	use python && python_mod_optimize libvirt.py
-
 	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
 		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
 	fi
@@ -423,7 +425,3 @@ pkg_postinst() {
 		elog "Ensure any resources your VMs use are accessible by qemu:qemu"
 	fi
 }
-
-pkg_postrm() {
-	use python && python_mod_cleanup libvirt.py
-}