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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 99 insertions, 12 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/Manifest b/app-emulation/virt-manager/Manifest
index 48cf513edc0a..59e261e3632e 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX virt-manager-0.8.2-ssh-tunnel-shutdown.patch 771 RMD160 adea4c43aca12e0d0000b77ffbca5bce5d079735 SHA1 c75731bde811b9e1ee3016e7a977d228dca6a708 SHA256 5ffbb3be721468e0a4e8e7bef34db26a83e29bb118db10015605956f436c40e0
+AUX virt-manager-0.8.4-customize-dialog-xmlparsedoc.patch 723 RMD160 9d390085db8ded74d953c4e6462794f90bd03dc0 SHA1 8b3ec66d07bc12244a8dca520821ef297b0209e2 SHA256 1df75fd9128c056a3f01e9d5bf1a0c389ae2c356986700c39ff94215bb60461b
 DIST virt-manager-0.8.2.tar.gz 2137638 RMD160 56b2b6218b0291d4cfa792970e7fe3e06892a2aa SHA1 2b5b80486e3c526793f05ad5db223c15c0c10b65 SHA256 8aec4721132edb38efbaa208e5e157f5b3a0bcfff26d728a7853c8e85c257a00
 DIST virt-manager-0.8.3.tar.gz 2223324 RMD160 518bb80f65dc10a69194fada36a0c9c44a9ee6fa SHA1 44ca670397a2f347fb1e1dff014e7525926dbc01 SHA256 c84ba3cead5c1c027eca813049875b99e0683355302f8bdf1c182ff86db825aa
 DIST virt-manager-0.8.4.tar.gz 2319338 RMD160 7cc747bbe4f9fa5af6ae4158a3404ee2a0338d3d SHA1 cdc8e65c84164c28ac5027c3bba46a3cd7531e96 SHA256 b9f7e6c6e3a552d60d711e352c3ba9cc0c025f5ef920701b74876ddd62dc8f76
 EBUILD virt-manager-0.8.2-r1.ebuild 1176 RMD160 235a35ce00b5307548790a1682dca5d96369251e SHA1 0dd013e2c8dbe64c40ad823f5775598e51f36339 SHA256 2816a20bc355e988e25b3103bb8a3d776631194e9f3a006cf8c773c0fc3a324e
 EBUILD virt-manager-0.8.2.ebuild 1101 RMD160 8cd7fdc78c95d02530dd758f0f8b5493261d4604 SHA1 648dd7e0941fd998cc900ca2afe17ea9786d4b69 SHA256 9c1382bc601174862fa3afa0f968c1afa42a320371d4c967533d11c5253bfd0a
 EBUILD virt-manager-0.8.3.ebuild 1180 RMD160 a01dd05303a6bcd8ec9a6c19ee1aa5c471108c86 SHA1 de87c3e08124ddf5cd4ba356bff1725fe9dc4a7f SHA256 8fb86985f698bc305c4969dad13f1e1dd2ec13842bc42f1a03df08de3d112841
+EBUILD virt-manager-0.8.4-r1.ebuild 1856 RMD160 1ee61afac989b46f81730cfc3d3c63ba5dd4acdb SHA1 21c19fe73709c4380b5e612201738c248e1d8ec5 SHA256 2f581d52837d211fbeb7092e77d1f2d8f076942f3553a124e6fc1ae2f5d79f22
 EBUILD virt-manager-0.8.4.ebuild 1790 RMD160 931a1437062442675596e5036ec6c0365b062f2f SHA1 f9bf78a7ede866c1cb79e8df36b876a2ff06f1b8 SHA256 48becdd162e966ffe2694d6e99921896a391ec4fbfb244e60e8b6718facb51d9
-MISC ChangeLog 5543 RMD160 2e29b20d2930039d9049ae0ec61bac2b8cab85af SHA1 7c011bc9cfb9f088992dcf22a76c6cbcef05e8ee SHA256 a442c565eb2e299fb7eb679e09dec7851e9dc7f6e1fe7b982d2f49acd6a097c8
+MISC ChangeLog 5891 RMD160 b9a58c4a1e94e8839185d52ac989be8b3ac00b94 SHA1 a05ce68c653052102dbbefa2a7737c9125286465 SHA256 640860e536a9d3156cb5c0623a5aedb675ea07ba63213815e6353f6dd55516b4
 MISC metadata.xml 369 RMD160 62906dbc1412445b82d3f9b8a98aded8b29fed46 SHA1 1b8343d037aa942777655e12abfeb26c4cd9bd70 SHA256 916da95eda8b9f06a902c3ee5e90f03043d916a3368823056bf817c526ae7fe5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvYt4kACgkQoeSe8B0zEfzeAQCeIfZH5sYHZvY2j0F3/8bmzpKA
-os0An14z3D4xC3lYOgwNdONPlhDdth1X
-=MQGS
------END PGP SIGNATURE-----
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
+}