Applied patch from upstream to fix customize dialog erroring in xmlParseDoc(). Thanks to Dennis Schridde <devurandom@gmx.net> finding this one. bug #322095

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 96 insertions, 1 deletions

diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index 879cabeb5324..4050055d60ad 100644
--- a/app-emulation/virt-manager/ChangeLog
+++ b/app-emulation/virt-manager/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/virt-manager
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.29 2010/04/28 22:32:31 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.30 2010/06/04 18:45:02 cardoe Exp $
+
+*virt-manager-0.8.4-r1 (04 Jun 2010)
+
+  04 Jun 2010; Doug Goldstein <cardoe@gentoo.org>
+  +virt-manager-0.8.4-r1.ebuild,
+  +files/virt-manager-0.8.4-customize-dialog-xmlparsedoc.patch:
+  Applied patch from upstream to fix customize dialog erroring in
+  xmlParseDoc(). Thanks to Dennis Schridde <devurandom@gmx.net> finding this
+  one. bug #322095
 
 *virt-manager-0.8.4 (28 Apr 2010)
 
diff --git a/app-emulation/virt-manager/files/virt-manager-0.8.4-customize-dialog-xmlparsedoc.patch b/app-emulation/virt-manager/files/virt-manager-0.8.4-customize-dialog-xmlparsedoc.patch
new file mode 100644
index 000000000000..7d3c7c4b95bb
--- /dev/null
+++ b/app-emulation/virt-manager/files/virt-manager-0.8.4-customize-dialog-xmlparsedoc.patch
@@ -0,0 +1,23 @@
+
+# HG changeset patch
+# User Cole Robinson <crobinso@redhat.com>
+# Date 1273168456 14400
+# Node ID f2d3931243fe7576701dec6deddf19cfc0145409
+# Parent  beb2272277eecd4bdc4015c905edf0b910bf9fa8
+Fix livecd 'customize before install' traceback
+
+--- a/src/virtManager/domain.py	Wed May 05 16:46:46 2010 -0400
++++ b/src/virtManager/domain.py	Thu May 06 13:54:16 2010 -0400
+@@ -1990,7 +1990,10 @@
+         return libvirt.VIR_DOMAIN_SHUTOFF
+ 
+     def get_xml(self):
+-        return self._backend.get_config_xml()
++        xml = self._backend.get_config_xml()
++        if not xml:
++            xml = self._backend.get_config_xml(install=False)
++        return xml
+     def _get_inactive_xml(self):
+         return self.get_xml()
+ 
+
diff --git a/app-emulation/virt-manager/virt-manager-0.8.4-r1.ebuild b/app-emulation/virt-manager/virt-manager-0.8.4-r1.ebuild
new file mode 100644
index 000000000000..c2f75824f301
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-0.8.4-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.8.4-r1.ebuild,v 1.1 2010/06/04 18:45:02 cardoe Exp $
+
+EAPI=2
+
+PYTHON_DEPEND="2:2.4"
+
+# Stop gnome2.eclass from doing stuff on USE=debug
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 python
+
+DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)"
+HOMEPAGE="http://virt-manager.org/"
+SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome-keyring policykit"
+RDEPEND=">=dev-python/pygtk-1.99.12
+	>=app-emulation/libvirt-0.7.0[python]
+	>=dev-libs/libxml2-2.6.23[python]
+	>=app-emulation/virtinst-0.500.3
+	>=gnome-base/librsvg-2
+	>=x11-libs/vte-0.12.2[python]
+	>=net-libs/gtk-vnc-0.3.8[python]
+	>=dev-python/dbus-python-0.61
+	>=dev-python/gconf-python-1.99.11
+	dev-python/urlgrabber
+	gnome-keyring? ( dev-python/gnome-keyring-python )
+	policykit? ( gnome-extra/polkit-gnome )"
+DEPEND="${RDEPEND}
+	app-text/rarian"
+
+src_prepare() {
+	sed -e "s/python/python2/" -i src/virt-manager.in || \
+		die "python2 update failed"
+
+	epatch "${FILESDIR}"/${P}-customize-dialog-xmlparsedoc.patch
+
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+
+	insinto /usr/share/virt-manager/pixmaps/
+	doins ${S}/pixmaps/*.png
+	doins ${S}/pixmaps/*.svg
+
+	insinto /usr/share/virt-manager/pixmaps/hicolor/16x16/actions/
+	doins ${S}/pixmaps/hicolor/16x16/actions/*.png
+
+	insinto /usr/share/virt-manager/pixmaps/hicolor/22x22/actions/
+	doins ${S}/pixmaps/hicolor/22x22/actions/*.png
+
+	insinto /usr/share/virt-manager/pixmaps/hicolor/24x24/actions/
+	doins ${S}/pixmaps/hicolor/24x24/actions/*.png
+
+	insinto /usr/share/virt-manager/pixmaps/hicolor/32x32/actions/
+	doins ${S}/pixmaps/hicolor/32x32/actions/*.png
+}