Backport fix for CVE-2011-1146 (bug #358877).

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

5 files changed, 16 insertions, 502 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 1e17f2436825..994e68b3588d 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.95 2011/02/17 14:14:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.96 2011/03/14 14:30:54 flameeyes Exp $
+
+*libvirt-0.8.8-r1 (14 Mar 2011)
+
+  14 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -libvirt-0.8.6-r1.ebuild, -libvirt-0.8.7-r1.ebuild, -libvirt-0.8.8.ebuild,
+  +libvirt-0.8.8-r1.ebuild:
+  Backport fix for CVE-2011-1146 (bug #358877).
 
 *libvirt-0.8.8 (17 Feb 2011)
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index edf28000d6be..b1c968d1a780 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -7,22 +7,19 @@ AUX libvirtd.init-r1 2558 RMD160 d87b527e9917ef926045fa07e809dc4527f04af7 SHA1 b
 AUX libvirtd.init-r2 3407 RMD160 9a5cf8a0d3bc4097871d8cf1581fc5a858e22abd SHA1 79e3d9848f03f66fc3bd5c438231a84b1bf3588e SHA256 8fb9a912cdf4974cfa7d23762468f67b5b2ef74620ce0c7270c72b4a8a691eef
 DIST libvirt-0.8.5-backports-2.tar.bz2 4213 RMD160 9d146f0f5e40d8e7d56d76561c67b40f30181b3c SHA1 aaeb6c97df52393d419ece2b1eec609cb3c7e9bf SHA256 4ad5b0aa099c31e6c653509ce361f405c13c6a2e3da23b47b12b6ba81ba30cf2
 DIST libvirt-0.8.5.tar.gz 13054019 RMD160 76c16d6b96fce74ab805e1f5cd4f7568dec6f48b SHA1 357da4d90d7730e6e529f086271d425a406c9c46 SHA256 0d4e6aa61ecbfccd3f3289a9821742d599db546eb3f37fe05036a616b3a9df8d
-DIST libvirt-0.8.6-backports-1.tar.bz2 2074 RMD160 b6c4fba2acb19d8e22b41a555858d0203d54c924 SHA1 22f7fcd2277abd216808c734f40e00d31ee191b6 SHA256 991f0e88e8470b6d4de9f53a034103d9cad72ef222b07b8a795947262d8e361b
-DIST libvirt-0.8.6.tar.gz 13296407 RMD160 a65add6ed9b00e2f065f9e791a02b61e851aa721 SHA1 087822d106c01c630a251461b56c81f08dc08639 SHA256 99d5f6f6890eaa78887832e218c01c79c410b6e76d8d526980906808e2487220
 DIST libvirt-0.8.7.tar.gz 13713267 RMD160 20a0651aee1bb35fbb69f3218ca96e92a2323446 SHA1 53b10513cb04c502a2c8aaf57039c71f0f79ea6f SHA256 da7b0e8bff7b2df2e19d732272674599bfb805787fb0d6f30289ba700ca77f31
+DIST libvirt-0.8.8-backports-1.tar.bz2 1321 RMD160 e10e1062abe8c03fb3d872bd0ce5700ec8e6dc08 SHA1 383181c7e2df7f5111ef26e93b48c2d7da13820b SHA256 15135a4f5170fc04dbc0a26a8c17783e343a3a48768dfbfa21108c621e82b8b3
 DIST libvirt-0.8.8.tar.gz 14150587 RMD160 2009761fa7cb01300d7c8c566ea8613f23289900 SHA1 b80374768d7bc3234735c1221aa554c75fe79ab8 SHA256 030aea3728917053555bec98d93d2855e8a603b758c0b2a5d57ac48b4f39e113
 EBUILD libvirt-0.8.5-r2.ebuild 7268 RMD160 27f3307e8dcbdbd57fff5c21caab67b38fa8ff86 SHA1 76e5534c0f341f6e39a9080081a72c84c2a1152b SHA256 2f9d79266501279652972a5ad8467a6a3002ce70a645f2d4d8cb8770ad98138f
-EBUILD libvirt-0.8.6-r1.ebuild 7328 RMD160 73c6f7a20c7a28aac5d439f1af41b78dbc80a2df SHA1 b1ee9099051dd7230a46d1497bff6e92f0ef2b12 SHA256 786f6697345c70654924a3305526ccc285b5d384bab117590bc4996b276d5e43
-EBUILD libvirt-0.8.7-r1.ebuild 7768 RMD160 f22cb6e14eaf4d587aef3d07b3036762bbb0d7bf SHA1 ca4d014af5eab4f3d74972e6119052ba32037e2e SHA256 49c8d2c145d926025db7b80d606a4b87bfa879dcbf713dd30d43576fb33189df
 EBUILD libvirt-0.8.7.ebuild 7762 RMD160 f8d686d26aadf7bd47683c36ec70fda2b1cc3ff3 SHA1 7f5a6eaa91852c7e96da34a11a78e2f5093f670b SHA256 64cae882bdf9ace9d88ed5d94a9610aa555490c1f965e7eb605ffd3fdf912395
-EBUILD libvirt-0.8.8.ebuild 7552 RMD160 477ee2684a4178ae575c067980388e43a53f6875 SHA1 5e9e323a21644b6591b84b930335e1f0e237158a SHA256 391180cf7b7236208a3d936530282a5381b45194e20e263d1e795b69696e5a23
+EBUILD libvirt-0.8.8-r1.ebuild 7554 RMD160 ee178f88881f667f6512b3a7caa9c9bc86632d77 SHA1 badeebb08a3b5f75e00a767b8ae3685066bef9b8 SHA256 a2dc8be0699364d12321b321a61ca630fdd8969f0f85689cdf228a984c430dc8
 EBUILD libvirt-9999.ebuild 7929 RMD160 f9d79b9d61fd9b95954a592990c45f5bdcc83160 SHA1 86d4d13baf0e03c19d0c6584668eac701ef93b81 SHA256 fffec29fe8fa311eb3abdc61cd40ed7d2304ebdcc36ecdb9a12b41a2eedcefe5
-MISC ChangeLog 21404 RMD160 fae3bb89a866ee77a79cacbf8e8142c349785fba SHA1 fe49cf8032f36a82c8d5b6b0ecf26680fdd9eee3 SHA256 3334a3bdf512d63d17c4af7727b7c8af20b07e4403ddbbbef9ef730636232c0f
+MISC ChangeLog 21647 RMD160 2cb7abb61f061eb9f5bee66636032df3bb174a2f SHA1 da0faf0e8a3de756910245879f0189157c10a021 SHA256 f1d233908bf8a1c0c9bea6ad538ab9632c3a57b8b9e53c29121ebc7e9f30791a
 MISC metadata.xml 3026 RMD160 c45bdcd924b283330b1211abc505e106f2ceb2b1 SHA1 ca4308eec5a3e7c6419a24f9ca06fdea64ccec8e SHA256 7f7722b3a05787803ae3bda78ceccbc1c48a8d53d80f98a7a1327e988fe9ea41
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1dLWQACgkQAiZjviIA2XiFzgCg3W9W+wvNV84b7yGxZe7itgHb
-N24AoIhbQc6fZRKPnEuS0EIIP0bYPM1f
-=9Zjt
+iEYEARECAAYFAk1+Jq8ACgkQAiZjviIA2XhrlgCgyLtsBVwi60x7r0VOD9yrQzaF
+mmsAn2y+x+M71Sms1R19oOYlJbqjouSP
+=SAMj
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-0.8.6-r1.ebuild b/app-emulation/libvirt/libvirt-0.8.6-r1.ebuild
deleted file mode 100644
index 350f6a247f52..000000000000
--- a/app-emulation/libvirt/libvirt-0.8.6-r1.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.6-r1.ebuild,v 1.3 2011/02/02 19:25:07 cardoe Exp $
-
-BACKPORTS=1
-
-EAPI="2"
-
-PYTHON_DEPEND="python? 2:2.4"
-#RESTRICT_PYTHON_ABIS="3.*"
-#SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils python autotools
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-SRC_URI="http://libvirt.org/sources/${P}.tar.gz
-	${BACKPORTS:+
-		http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2
-		http://dev.gentoo.org/~cardoe/${PN}/${P}-backports-${BACKPORTS}.tar.bz2}"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi caps debug iscsi +libvirtd lvm +lxc macvtap +network nfs nls \
-	numa openvz parted pcap phyp policykit python qemu sasl selinux
-	uml virtualbox xen udev +json"
-# IUSE=one : bug #293416 & bug #299011
-
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=net-misc/curl-7.18.0
-	>=dev-libs/libxml2-2.7.6
-	>=dev-libs/libnl-1.1
-	>=net-libs/gnutls-1.0.25
-	sys-fs/sysfsutils
-	sys-apps/util-linux
-	>=net-analyzer/netcat6-1.0-r2
-	avahi? ( >=net-dns/avahi-0.6[dbus] )
-	caps? ( sys-libs/libcap-ng )
-	iscsi? ( sys-block/open-iscsi )
-	libvirtd? ( net-misc/bridge-utils )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-	macvtap? ( >=dev-libs/libnl-1.1 )
-	nfs? ( net-fs/nfs-utils )
-	numa? ( sys-process/numactl )
-	openvz? ( sys-kernel/openvz-sources )
-	parted? ( >=sys-block/parted-1.8[device-mapper] )
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	phyp? ( net-libs/libssh2 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 app-emulation/qemu-kvm-spice ) )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	xen? ( app-emulation/xen-tools app-emulation/xen )
-	udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 )
-	json? ( dev-libs/yajl )"
-# one? ( dev-libs/xmlrpc-c )
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	myconf="${myconf} $(use_enable debug)"
-
-	## 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="${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)"
-	# doesn't belong with hypervisors but links to libvirtd for some reason
-	#myconf="${myconf} $(use_with one)"
-
-	## hypervisor protocols
-	myconf="${myconf} $(use_with phyp)"
-	myconf="${myconf} --with-esx"
-
-	## additional host drivers
-	myconf="${myconf} $(use_with 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 numa numactl)"
-	myconf="${myconf} $(use_with selinux)"
-
-	# 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 biits
-	myconf="${myconf} $(use_with macvtap)"
-	# --with-pcap will cause problems, should be fixed after 0.8.7
-	use pcap || myconf="${myconf} --without-libpcap"
-
-	## other
-	myconf="${myconf} $(use_enable nls)"
-	myconf="${myconf} $(use_with python)"
-	myconf="${myconf} $(use_with json yajl)"
-
-	## stuff we don't yet support
-	myconf="${myconf} --without-netcf --without-audit"
-
-	# we use udev over hal
-	myconf="${myconf} --without-hal"
-
-	# 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 \
-		--with-remote-pid-file=/var/run/libvirtd.pid
-}
-
-src_test() {
-	# Explicitly allow parallel build of tests
-	emake check || die "tests failed"
-}
-
-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 \
-		|| die "emake install failed"
-
-	find "${D}" -name '*.la' -delete || die
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newinitd "${FILESDIR}/libvirtd.init-r1" libvirtd || die
-	newconfd "${FILESDIR}/libvirtd.confd-r1" libvirtd || die
-
-	keepdir /var/lib/libvirt/images
-}
-
-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
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize $(python_get_sitedir)/libvirt.py
-
-	elog
-	if use policykit && has_version sys-auth/policykit; then
-		elog "You must have run the following at least once:"
-		elog
-		elog "$ polkit-auth --grant org.libvirt.unix.manage --user \"USERNAME\""
-		elog
-		elog "to grant USERNAME access to libvirt when using USE=policykit"
-	else
-		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!
-
-	elog
-	elog "For the basic networking support (bridged and routed networks)"
-	elog "you don't need any extra software. For more complex network modes"
-	elog "including but not limited to NATed network, you'll need the"
-	elog "following packages":
-	elog
-	elog "	net-dns/dnsmasq"
-	elog "	>=net-firewall/iptables-1.4.10"
-	elog "	net-firewall/ebtables"
-	elog
-	if has_version net-dns/dnsmasq; then
-		ewarn "If you have a DNS server setup on your machine, you will have"
-		ewarn "to configure /etc/dnsmasq.conf to enable the following settings: "
-		ewarn " bind-interfaces"
-		ewarn " interface or except-interface"
-		ewarn
-		ewarn "Otherwise you might have issues with your existing DNS server."
-	fi
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup $(python_get_sitedir)/libvirt.py
-}
diff --git a/app-emulation/libvirt/libvirt-0.8.7-r1.ebuild b/app-emulation/libvirt/libvirt-0.8.7-r1.ebuild
deleted file mode 100644
index 1960f4056037..000000000000
--- a/app-emulation/libvirt/libvirt-0.8.7-r1.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.7-r1.ebuild,v 1.2 2011/02/02 19:25:07 cardoe Exp $
-
-#BACKPORTS=1
-#AUTOTOOLIZE=yes
-
-EAPI="2"
-
-PYTHON_DEPEND="python? 2:2.4"
-#RESTRICT_PYTHON_ABIS="3.*"
-#SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils python ${AUTOTOOLIZE+autotools}
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-SRC_URI="http://libvirt.org/sources/${P}.tar.gz
-	${BACKPORTS:+
-		http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2
-		http://dev.gentoo.org/~cardoe/${PN}/${P}-backports-${BACKPORTS}.tar.bz2}"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi caps debug iscsi +json +libvirtd lvm +lxc macvtap +network nfs \
-	nls numa openvz parted pcap phyp policykit python qemu sasl selinux udev \
-	uml virtualbox virt-network xen"
-# IUSE=one : bug #293416 & bug #299011
-
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=net-misc/curl-7.18.0
-	>=dev-libs/libxml2-2.7.6
-	>=dev-libs/libnl-1.1
-	>=net-libs/gnutls-1.0.25
-	sys-fs/sysfsutils
-	sys-apps/util-linux
-	>=net-analyzer/netcat6-1.0-r2
-	avahi? ( >=net-dns/avahi-0.6[dbus] )
-	caps? ( sys-libs/libcap-ng )
-	iscsi? ( sys-block/open-iscsi )
-	json? ( dev-libs/yajl )
-	libvirtd? ( net-misc/bridge-utils )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-	macvtap? ( >=dev-libs/libnl-1.1 )
-	nfs? ( net-fs/nfs-utils )
-	numa? ( sys-process/numactl )
-	openvz? ( sys-kernel/openvz-sources )
-	parted? ( >=sys-block/parted-1.8[device-mapper] )
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	phyp? ( net-libs/libssh2 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 app-emulation/qemu-kvm-spice ) )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	xen? ( app-emulation/xen-tools app-emulation/xen )
-	udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 )
-	virt-network? ( net-dns/dnsmasq
-		>=net-firewall/iptables-1.4.10
-		net-firewall/ebtables
-		sys-apps/iproute2 )"
-# one? ( dev-libs/xmlrpc-c )
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	# This is required to be able to run the tests when using the sandbox
-	if [[ ${LD_PRELOAD} == libsandbox.so ]]; then
-		sed -i -e '/LOGNAME/iENV:LD_PRELOAD=libsandbox.so' \
-			"${S}"/tests/commanddata/*.log || die
-		sed -i -e '/DISPLAY/aENV:LD_PRELOAD=libsandbox.so' \
-			"${S}"/tests/commanddata/test6.log || die
-		sed -i -e '/LANG/aENV:LD_PRELOAD=libsandbox.so' \
-			"${S}"/tests/commanddata/test8.log || die
-	fi
-
-	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	myconf="${myconf} $(use_enable debug)"
-
-	## 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="${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)"
-	# doesn't belong with hypervisors but links to libvirtd for some reason
-	#myconf="${myconf} $(use_with one)"
-
-	## hypervisor protocols
-	myconf="${myconf} $(use_with phyp)"
-	myconf="${myconf} --with-esx"
-
-	## additional host drivers
-	myconf="${myconf} $(use_with 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 numa numactl)"
-	myconf="${myconf} $(use_with selinux)"
-
-	# 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 biits
-	myconf="${myconf} $(use_with macvtap)"
-	myconf="${myconf} $(use_with pcap libpcap)"
-
-	## other
-	myconf="${myconf} $(use_enable nls)"
-	myconf="${myconf} $(use_with python)"
-	myconf="${myconf} $(use_with json yajl)"
-
-	## stuff we don't yet support
-	myconf="${myconf} --without-netcf --without-audit"
-
-	# we use udev over hal
-	myconf="${myconf} --without-hal"
-
-	# 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 \
-		--with-remote-pid-file=/var/run/libvirtd.pid
-}
-
-src_test() {
-	# Explicitly allow parallel build of tests
-	emake check || die "tests failed"
-}
-
-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 \
-		|| die "emake install failed"
-
-	find "${D}" -name '*.la' -delete || die
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newinitd "${FILESDIR}/libvirtd.init-r2" libvirtd || die
-	newconfd "${FILESDIR}/libvirtd.confd-r2" libvirtd || die
-
-	keepdir /var/lib/libvirt/images
-}
-
-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
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize $(python_get_sitedir)/libvirt.py
-
-	elog
-	if use policykit && has_version sys-auth/policykit; then
-		elog "You must have run the following at least once:"
-		elog
-		elog "$ polkit-auth --grant org.libvirt.unix.manage --user \"USERNAME\""
-		elog
-		elog "to grant USERNAME access to libvirt when using USE=policykit"
-	else
-		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!
-
-	elog
-	elog "For the basic networking support (bridged and routed networks)"
-	elog "you don't need any extra software. For more complex network modes"
-	elog "including but not limited to NATed network, you can enable the"
-	elog "'virt-network' USE flag."
-	elog
-	if has_version net-dns/dnsmasq; then
-		ewarn "If you have a DNS server setup on your machine, you will have"
-		ewarn "to configure /etc/dnsmasq.conf to enable the following settings: "
-		ewarn " bind-interfaces"
-		ewarn " interface or except-interface"
-		ewarn
-		ewarn "Otherwise you might have issues with your existing DNS server."
-	fi
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup $(python_get_sitedir)/libvirt.py
-}
diff --git a/app-emulation/libvirt/libvirt-0.8.8.ebuild b/app-emulation/libvirt/libvirt-0.8.8-r1.ebuild
index 3bd8c92d1487..f68be3992810 100644
--- a/app-emulation/libvirt/libvirt-0.8.8.ebuild
+++ b/app-emulation/libvirt/libvirt-0.8.8-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.8.ebuild,v 1.1 2011/02/17 14:14:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.8-r1.ebuild,v 1.1 2011/03/14 14:30:54 flameeyes Exp $
 
-#BACKPORTS=1
+BACKPORTS=1
 #AUTOTOOLIZE=yes
 
 EAPI="2"