handful of upstream fixes

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

8 files changed, 673 insertions, 2 deletions

diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index de7edafcd72b..ca349c7b6b97 100644
--- a/app-emulation/virt-manager/ChangeLog
+++ b/app-emulation/virt-manager/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-emulation/virt-manager
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.13 2009/05/20 17:51:59 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.14 2009/05/28 21:24:53 cardoe Exp $
+
+*virt-manager-0.7.0-r1 (28 May 2009)
+
+  28 May 2009; Doug Goldstein <cardoe@gentoo.org>
+  +virt-manager-0.7.0-r1.ebuild,
+  +files/virt-manager-0.7.0-delete-dup-conn.patch,
+  +files/virt-manager-0.7.0-fix-button-ordering.patch,
+  +files/virt-manager-0.7.0-fix-vcpu-cap.patch,
+  +files/virt-manager-0.7.0-old-xen-compat.patch,
+  +files/virt-manager-0.7.0-vm-migrate-list.patch:
+  handful of upstream fixes
 
   20 May 2009; Tobias Scherbaum <dertobi123@gentoo.org>
   virt-manager-0.7.0.ebuild:
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 7cbada09ca39..21a747a47c7c 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,5 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX virt-manager-0.5.4-polkit-root.patch 783 RMD160 1884e5f5ebf6eb9d750b958c0000b8f62ab561bd SHA1 b307640001d011c52eee05be299d57f95411ba45 SHA256 2a2f17dc73af24123b38b897ca411c3171d028dbffed7955c2b345966340328a
 AUX virt-manager-0.6.0-read-only-fallback.patch 2724 RMD160 adbe675e909c4dabcfdd6d20439659cceeaafb54 SHA1 c6eb5eaa39c71738186252d6d60f59cb6e94541a SHA256 2c6f395b0df3802c316c44f3100ac833352446b8432a83e2aa1cd34abf7228be
+AUX virt-manager-0.7.0-delete-dup-conn.patch 1266 RMD160 31943b2fd5f0da7b32fb0e629b1ffe88f1d015d4 SHA1 11386c8d3bf4e45e6485328ada752a0a3789cbda SHA256 b667b17a214cf06a9583999e4ee0dac37bd2fe1c27a8abdb6d065d6436d79c5d
+AUX virt-manager-0.7.0-fix-button-ordering.patch 17168 RMD160 4d8768148feccd75f65961a7ec0aa4e19e2a0457 SHA1 b53e048b3e2bf9918694e630fe8714224a7a2b60 SHA256 cb5a7a6b8719b1a06c44a1376d402c0b146078734c388a5e218f083a76b7904c
+AUX virt-manager-0.7.0-fix-vcpu-cap.patch 2657 RMD160 754522ee0a2acff21236ae8a0c5f65f0ec30f72e SHA1 f3ea3c0aef7d735498c6e5ae39939a6940b9f3ba SHA256 e6d313d0517fd0f0a4884806018a1e27dc766b7d0201d5ad4736a2d9dcfc5e69
+AUX virt-manager-0.7.0-old-xen-compat.patch 6475 RMD160 3030240288598a7dc1a2be40ed60d379dc3f5739 SHA1 3161263a14e3adb7a5f940ae79e1055c27ebaa10 SHA256 470e64aaeffe4e148f365d88997f770c25cacf7bed0c31ecc655e823bb161084
+AUX virt-manager-0.7.0-vm-migrate-list.patch 2578 RMD160 809b937b2652ed6caece5faab36a4da11cdbb7a8 SHA1 e65a1a33a538f4e2c6567b3d9391aa3e24beffbe SHA256 3e9c6215b8852d87093502b6af15e604f148029749f2eb557a19c009a8809289
 DIST virt-manager-0.5.1.tar.gz 1772253 RMD160 181fbb0ef1bfe20e7957f8650a8c1f999e8dc8a0 SHA1 39bc03fcaeea5c8e820f025abc7c0ab24bdbf217 SHA256 7afd369795ae11943d534847c9d7b3ee1002d88408c6d3840a4aa672c5e01f5c
 DIST virt-manager-0.5.4.tar.gz 1850750 RMD160 ec513941f005b1f1202d95a5b067e35bd3c55790 SHA1 6df1aef22407a618fd7584b035fcde2799d8858c SHA256 7bbdb9ed1215f8f5949076a244cf489b8f1826bbd8c394c43378301518e12488
 DIST virt-manager-0.6.0.tar.gz 1938191 RMD160 71e43729a8a1821cb6751bc3f120a8748f6ba567 SHA1 f142877390f4ceb457fe8d435c7e32ba25842508 SHA256 294e39bd4dde556ad40e81eea9d7aa37c376875ecde4c2ad1bc40304531d18ac
@@ -7,6 +15,14 @@ DIST virt-manager-0.7.0.tar.gz 2010911 RMD160 48fc2bf1c1ce217d6794dd0fb4ebfb6316
 EBUILD virt-manager-0.5.1.ebuild 1582 RMD160 9583efe0c4ac4d4646bc8bb084c7d3b0ae7ad2d0 SHA1 b733fae7aa09be5ce5abd5a2d2154d71d7e9e6f4 SHA256 3b65b1b45172faad06c93a0c96f0137dbf5903020930df652cf45bc0105e5128
 EBUILD virt-manager-0.5.4.ebuild 1683 RMD160 55ceb81a2ca9bc1b8bf99241a1b141b9ee0067d0 SHA1 ca689ec0b74d5f5e2d616fdba931f4c08e2150ec SHA256 b10065ed641b6dd5ce6782213a353abcb1abfa958ec6f0e650020be5977c1534
 EBUILD virt-manager-0.6.0-r1.ebuild 1460 RMD160 b883355095cff4a722dcbc104d57449f2ecbcf00 SHA1 a8ea61dd14d68c47edc0c4b41f5161ac14a2277f SHA256 15bc578c4450be799b7a2dec32da7209d9914b9a28b2b8fb852b2fd396cffab9
+EBUILD virt-manager-0.7.0-r1.ebuild 1291 RMD160 a8c808663e35e1af7befe452fa67963c1a0bab02 SHA1 7e8d8f5a3ee9c24d496a3238985565e90fb4878a SHA256 9ffd98428ac7fbb6270172aed0b95a8e12258162283b74ccceade6625b9d8fb9
 EBUILD virt-manager-0.7.0.ebuild 1028 RMD160 a1a266d155b3083ad1a1bd9e874d38b0ffc82ed6 SHA1 532395bfc8448cd3078ebef8392adec938124129 SHA256 dfc31ca963d63ae57e087a1b91c74302622093b6db5b4b3199843e8309edcece
-MISC ChangeLog 2408 RMD160 07f80f87fc8c6f428723a094161fa5e863136a0c SHA1 aa4a7ef5d4414ce786a2525eed3b261f71de4f22 SHA256 f88dc86c5f35dce4fb121dac3c1b8145fdee5dc6d05761dbe6dd5ee5c9a397af
+MISC ChangeLog 2809 RMD160 16bbc7c7e3fba70aaaccff7faf9f89f16ee1219d SHA1 34544577b05f6a09cceb6812616197e4ea1b2418 SHA256 3507dd0f240307758c8d3a2f857fa8c3e099f6a7e0cda42bd705a405062ad6cc
 MISC metadata.xml 340 RMD160 bfe7320177e9b0e2a6929daf1daf327e978c82a0 SHA1 038372b43a6541e118700b353380c3200e4423fd SHA256 516f8dae2fd09d7967c2f1677c9488697cda14dc79750f67f8193d097568a451
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkofAS0ACgkQoeSe8B0zEfwwqACfSn8S9oI3fXo9UnTQ/i/tmr/w
+Va0AnAlD6Aj/uiJYBsWMMgaKaba60Nss
+=SFRt
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/virt-manager/files/virt-manager-0.7.0-delete-dup-conn.patch b/app-emulation/virt-manager/files/virt-manager-0.7.0-delete-dup-conn.patch
new file mode 100644
index 000000000000..827e4a577394
--- /dev/null
+++ b/app-emulation/virt-manager/files/virt-manager-0.7.0-delete-dup-conn.patch
@@ -0,0 +1,34 @@
+# HG changeset patch
+# User Cole Robinson <crobinso@redhat.com>
+# Date 1238782522 14400
+# Node ID 218ecc7495319b70960c5e3685e8597700c29bfb
+# Parent  5abfbc44b41efc4fae9b154bb515044c32ffc0f4
+Use dup_conn in delete dialog.
+
+diff -r 5abfbc44b41e -r 218ecc749531 src/virtManager/delete.py
+--- a/src/virtManager/delete.py	Fri Apr 03 14:15:15 2009 -0400
++++ b/src/virtManager/delete.py	Fri Apr 03 14:15:22 2009 -0400
+@@ -25,9 +25,9 @@
+ import traceback
+ import logging
+ 
+-import libvirt
+ import virtinst
+ 
++from virtManager import util
+ from virtManager.error import vmmErrorDialog
+ from virtManager.asyncjob import vmmAsyncJob
+ from virtManager.createmeter import vmmCreateMeter
+@@ -159,11 +159,7 @@
+         try:
+             # Open a seperate connection to install on since this is async
+             logging.debug("Threading off connection to delete vol.")
+-            #newconn = vmmConnection(self.config, self.conn.get_uri(),
+-            #                        self.conn.is_read_only())
+-            #newconn.open()
+-            #newconn.connectThreadEvent.wait()
+-            newconn = libvirt.open(self.conn.get_uri())
++            newconn = util.dup_conn(self.config, self.conn)
+             meter = vmmCreateMeter(asyncjob)
+ 
+             for path in paths:
diff --git a/app-emulation/virt-manager/files/virt-manager-0.7.0-fix-button-ordering.patch b/app-emulation/virt-manager/files/virt-manager-0.7.0-fix-button-ordering.patch
new file mode 100644
index 000000000000..d8f4d34be49c
--- /dev/null
+++ b/app-emulation/virt-manager/files/virt-manager-0.7.0-fix-button-ordering.patch
@@ -0,0 +1,305 @@
+# HG changeset patch
+# User Cole Robinson <crobinso@redhat.com>
+# Date 1238787321 14400
+# Node ID 71d9208d322631118bbdc110388c333bd1f784eb
+# Parent  9b4b6eb8de8d9e7b0e906715fb503a0b1ab0f30d
+Reorder buttons in the delete dialog.
+
+diff -r 9b4b6eb8de8d -r 71d9208d3226 src/vmm-delete.glade
+--- a/src/vmm-delete.glade	Fri Apr 03 14:58:51 2009 -0400
++++ b/src/vmm-delete.glade	Fri Apr 03 15:35:21 2009 -0400
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+-<!--Generated with glade3 3.4.5 on Wed Feb 25 17:45:14 2009 -->
++<!--Generated with glade3 3.4.5 on Fri Apr  3 15:34:40 2009 -->
+ <glade-interface>
+   <widget class="GtkDialog" id="vmm-delete">
+     <property name="width_request">500</property>
+@@ -115,6 +115,17 @@
+             <property name="visible">True</property>
+             <property name="layout_style">GTK_BUTTONBOX_END</property>
+             <child>
++              <widget class="GtkButton" id="delete-cancel">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="label" translatable="yes">gtk-cancel</property>
++                <property name="use_stock">True</property>
++                <property name="response_id">0</property>
++                <signal name="clicked" handler="on_delete_cancel_clicked"/>
++              </widget>
++            </child>
++            <child>
+               <widget class="GtkButton" id="delete-ok">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+@@ -124,17 +135,6 @@
+                 <property name="response_id">0</property>
+                 <signal name="clicked" handler="on_delete_ok_clicked"/>
+               </widget>
+-            </child>
+-            <child>
+-              <widget class="GtkButton" id="delete-cancel">
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="label" translatable="yes">gtk-cancel</property>
+-                <property name="use_stock">True</property>
+-                <property name="response_id">0</property>
+-                <signal name="clicked" handler="on_delete_cancel_clicked"/>
+-              </widget>
+               <packing>
+                 <property name="position">1</property>
+               </packing>
+# HG changeset patch
+# User Cole Robinson <crobinso@redhat.com>
+# Date 1238787521 14400
+# Node ID 6f0170f9d551ff54dcedca188bbf84313c551a30
+# Parent  71d9208d322631118bbdc110388c333bd1f784eb
+Change 'choose cd' button ordering.
+
+diff -r 71d9208d3226 -r 6f0170f9d551 src/vmm-choose-cd.glade
+--- a/src/vmm-choose-cd.glade	Fri Apr 03 15:35:21 2009 -0400
++++ b/src/vmm-choose-cd.glade	Fri Apr 03 15:38:41 2009 -0400
+@@ -40,97 +40,19 @@
+                           <placeholder/>
+                         </child>
+                         <child>
+-                          <widget class="GtkHBox" id="hbox2">
+-                            <property name="visible">True</property>
+-                            <child>
+-                              <widget class="GtkLabel" id="label38">
+-                                <property name="visible">True</property>
+-                                <property name="xpad">5</property>
+-                                <property name="label" translatable="yes">_Path to install media:</property>
+-                                <property name="use_underline">True</property>
+-                                <property name="mnemonic_widget">cd-path</property>
+-                              </widget>
+-                              <packing>
+-                                <property name="expand">False</property>
+-                                <property name="fill">False</property>
+-                              </packing>
+-                            </child>
+-                            <child>
+-                              <widget class="GtkComboBox" id="cd-path">
+-                                <property name="visible">True</property>
+-                                <signal name="changed" handler="on_cd_path_changed"/>
+-                              </widget>
+-                              <packing>
+-                                <property name="position">1</property>
+-                              </packing>
+-                            </child>
+-                          </widget>
+-                          <packing>
+-                            <property name="left_attach">1</property>
+-                            <property name="right_attach">3</property>
+-                            <property name="top_attach">3</property>
+-                            <property name="bottom_attach">4</property>
+-                          </packing>
+-                        </child>
+-                        <child>
+-                          <widget class="GtkAlignment" id="alignment5">
++                          <widget class="GtkAlignment" id="alignment4">
+                             <property name="visible">True</property>
+                             <property name="yalign">0</property>
+                             <property name="yscale">0</property>
+                             <child>
+-                              <widget class="GtkRadioButton" id="iso-image">
+-                                <property name="visible">True</property>
+-                                <property name="can_focus">True</property>
+-                                <property name="label" translatable="yes">_ISO Image Location:</property>
+-                                <property name="use_underline">True</property>
+-                                <property name="response_id">0</property>
+-                                <property name="draw_indicator">True</property>
+-                                <property name="group">physical-media</property>
+-                                <signal name="toggled" handler="on_media_toggled"/>
+-                              </widget>
++                              <placeholder/>
+                             </child>
+                           </widget>
+                           <packing>
+-                            <property name="right_attach">3</property>
+-                            <property name="x_options">GTK_FILL</property>
+-                            <property name="y_options">GTK_FILL</property>
+-                          </packing>
+-                        </child>
+-                        <child>
+-                          <widget class="GtkRadioButton" id="physical-media">
+-                            <property name="visible">True</property>
+-                            <property name="can_focus">True</property>
+-                            <property name="label" translatable="yes">_CD-ROM or DVD:</property>
+-                            <property name="use_underline">True</property>
+-                            <property name="response_id">0</property>
+-                            <property name="active">True</property>
+-                            <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="on_media_toggled"/>
+-                          </widget>
+-                          <packing>
+-                            <property name="right_attach">3</property>
+-                            <property name="top_attach">2</property>
+-                            <property name="bottom_attach">3</property>
+-                            <property name="x_options">GTK_FILL</property>
+-                            <property name="y_options">GTK_FILL</property>
+-                          </packing>
+-                        </child>
+-                        <child>
+-                          <widget class="GtkLabel" id="label36">
+-                            <property name="visible">True</property>
+-                            <property name="xalign">1</property>
+-                            <property name="label" translatable="yes">ISO _Location:</property>
+-                            <property name="use_underline">True</property>
+-                            <property name="mnemonic_widget">iso-path</property>
+-                          </widget>
+-                          <packing>
+-                            <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">1</property>
+                             <property name="bottom_attach">2</property>
+                             <property name="x_options">GTK_FILL</property>
+-                            <property name="y_options"></property>
+-                            <property name="x_padding">3</property>
++                            <property name="y_options">GTK_FILL</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -168,21 +90,99 @@
+                           </packing>
+                         </child>
+                         <child>
+-                          <widget class="GtkAlignment" id="alignment4">
++                          <widget class="GtkLabel" id="label36">
++                            <property name="visible">True</property>
++                            <property name="xalign">1</property>
++                            <property name="label" translatable="yes">ISO _Location:</property>
++                            <property name="use_underline">True</property>
++                            <property name="mnemonic_widget">iso-path</property>
++                          </widget>
++                          <packing>
++                            <property name="left_attach">1</property>
++                            <property name="right_attach">2</property>
++                            <property name="top_attach">1</property>
++                            <property name="bottom_attach">2</property>
++                            <property name="x_options">GTK_FILL</property>
++                            <property name="y_options"></property>
++                            <property name="x_padding">3</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <widget class="GtkRadioButton" id="physical-media">
++                            <property name="visible">True</property>
++                            <property name="can_focus">True</property>
++                            <property name="label" translatable="yes">_CD-ROM or DVD:</property>
++                            <property name="use_underline">True</property>
++                            <property name="response_id">0</property>
++                            <property name="active">True</property>
++                            <property name="draw_indicator">True</property>
++                            <signal name="toggled" handler="on_media_toggled"/>
++                          </widget>
++                          <packing>
++                            <property name="right_attach">3</property>
++                            <property name="top_attach">2</property>
++                            <property name="bottom_attach">3</property>
++                            <property name="x_options">GTK_FILL</property>
++                            <property name="y_options">GTK_FILL</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <widget class="GtkAlignment" id="alignment5">
+                             <property name="visible">True</property>
+                             <property name="yalign">0</property>
+                             <property name="yscale">0</property>
+                             <child>
+-                              <placeholder/>
++                              <widget class="GtkRadioButton" id="iso-image">
++                                <property name="visible">True</property>
++                                <property name="can_focus">True</property>
++                                <property name="label" translatable="yes">_ISO Image Location:</property>
++                                <property name="use_underline">True</property>
++                                <property name="response_id">0</property>
++                                <property name="draw_indicator">True</property>
++                                <property name="group">physical-media</property>
++                                <signal name="toggled" handler="on_media_toggled"/>
++                              </widget>
+                             </child>
+                           </widget>
+                           <packing>
+-                            <property name="top_attach">1</property>
+-                            <property name="bottom_attach">2</property>
++                            <property name="right_attach">3</property>
+                             <property name="x_options">GTK_FILL</property>
+                             <property name="y_options">GTK_FILL</property>
+                           </packing>
+                         </child>
++                        <child>
++                          <widget class="GtkHBox" id="hbox2">
++                            <property name="visible">True</property>
++                            <child>
++                              <widget class="GtkLabel" id="label38">
++                                <property name="visible">True</property>
++                                <property name="xpad">5</property>
++                                <property name="label" translatable="yes">_Path to install media:</property>
++                                <property name="use_underline">True</property>
++                                <property name="mnemonic_widget">cd-path</property>
++                              </widget>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <widget class="GtkComboBox" id="cd-path">
++                                <property name="visible">True</property>
++                                <signal name="changed" handler="on_cd_path_changed"/>
++                              </widget>
++                              <packing>
++                                <property name="position">1</property>
++                              </packing>
++                            </child>
++                          </widget>
++                          <packing>
++                            <property name="left_attach">1</property>
++                            <property name="right_attach">3</property>
++                            <property name="top_attach">3</property>
++                            <property name="bottom_attach">4</property>
++                          </packing>
++                        </child>
+                       </widget>
+                     </child>
+                   </widget>
+@@ -209,6 +209,17 @@
+             <property name="visible">True</property>
+             <property name="layout_style">GTK_BUTTONBOX_END</property>
+             <child>
++              <widget class="GtkButton" id="Cancel">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="can_default">True</property>
++                <property name="label">gtk-cancel</property>
++                <property name="use_stock">True</property>
++                <property name="response_id">-6</property>
++                <signal name="clicked" handler="on_cancel_clicked"/>
++              </widget>
++            </child>
++            <child>
+               <widget class="GtkButton" id="OK">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+@@ -218,17 +229,6 @@
+                 <property name="response_id">-5</property>
+                 <signal name="clicked" handler="on_ok_clicked"/>
+               </widget>
+-            </child>
+-            <child>
+-              <widget class="GtkButton" id="Cancel">
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="can_default">True</property>
+-                <property name="label">gtk-cancel</property>
+-                <property name="use_stock">True</property>
+-                <property name="response_id">-6</property>
+-                <signal name="clicked" handler="on_cancel_clicked"/>
+-              </widget>
+               <packing>
+                 <property name="position">1</property>
+               </packing>
diff --git a/app-emulation/virt-manager/files/virt-manager-0.7.0-fix-vcpu-cap.patch b/app-emulation/virt-manager/files/virt-manager-0.7.0-fix-vcpu-cap.patch
new file mode 100644
index 000000000000..2bc90814dc30
--- /dev/null
+++ b/app-emulation/virt-manager/files/virt-manager-0.7.0-fix-vcpu-cap.patch
@@ -0,0 +1,40 @@
+# HG changeset patch
+# User Cole Robinson <crobinso@redhat.com>
+# Date 1239034964 14400
+# Node ID c5489151e2e6bd37c41b543efb79186739fb1b3c
+# Parent  3cfb5918b1a80b9eea3282244a27f512f566eb2e
+Fix incorrect vcpu capping in create wizard.
+
+Cap was always 10 less than we intended. Apparently spinbutton page_size != 0
+is deprecated, yet is the default set by glade3? Schweet.
+
+diff -r 3cfb5918b1a8 -r c5489151e2e6 src/vmm-create.glade
+--- a/src/vmm-create.glade	Mon Apr 06 11:33:46 2009 -0400
++++ b/src/vmm-create.glade	Mon Apr 06 12:22:44 2009 -0400
+@@ -826,7 +826,7 @@
+                                             <property name="visible">True</property>
+                                             <property name="can_focus">True</property>
+                                             <property name="xalign">1</property>
+-                                            <property name="adjustment">0 0 8096 1 10 10</property>
++                                            <property name="adjustment">0 0 8096 1 10 0</property>
+                                             <property name="climb_rate">1</property>
+                                           </widget>
+                                           <packing>
+@@ -841,7 +841,7 @@
+                                             <property name="visible">True</property>
+                                             <property name="can_focus">True</property>
+                                             <property name="xalign">1</property>
+-                                            <property name="adjustment">0 0 128 1 10 10</property>
++                                            <property name="adjustment">0 0 128 1 10 0</property>
+                                             <property name="climb_rate">1</property>
+                                           </widget>
+                                           <packing>
+@@ -1025,7 +1025,7 @@
+                                                 <property name="visible">True</property>
+                                                 <property name="can_focus">True</property>
+                                                 <property name="xalign">1</property>
+-                                                <property name="adjustment">2 0 1000000 0.10000000000000001 10 10</property>
++                                                <property name="adjustment">2 0 1000000 0.10000000000000001 10 0</property>
+                                                 <property name="climb_rate">1</property>
+                                                 <property name="digits">1</property>
+                                               </widget>
diff --git a/app-emulation/virt-manager/files/virt-manager-0.7.0-old-xen-compat.patch b/app-emulation/virt-manager/files/virt-manager-0.7.0-old-xen-compat.patch
new file mode 100644
index 000000000000..cb05c3db379d
--- /dev/null
+++ b/app-emulation/virt-manager/files/virt-manager-0.7.0-old-xen-compat.patch
@@ -0,0 +1,161 @@
+# HG changeset patch
+# User Cole Robinson <crobinso@redhat.com>
+# Date 1236957667 14400
+# Node ID 4331403b2e66dafdda618283dcea259a66fba423
+# Parent  89c007e38850e1283447ea4c19ff6f64ce6224b6
+Fix xml parsing for old style 'console' xml.
+
+diff -r 89c007e38850 -r 4331403b2e66 src/virtManager/details.py
+--- a/src/virtManager/details.py	Mon Mar 09 23:38:03 2009 -0400
++++ b/src/virtManager/details.py	Fri Mar 13 11:21:07 2009 -0400
+@@ -1106,7 +1106,7 @@
+                                              _("(Primary Console)") or "")
+         self.window.get_widget("char-type").set_markup(typelabel)
+         self.window.get_widget("char-dev-type").set_text(charinfo[4] or "-")
+-        self.window.get_widget("char-target-port").set_text(charinfo[3])
++        self.window.get_widget("char-target-port").set_text(charinfo[3] or "")
+         self.window.get_widget("char-source-path").set_text(charinfo[5] or "-")
+ 
+     def refresh_hostdev_page(self):
+diff -r 89c007e38850 -r 4331403b2e66 src/virtManager/domain.py
+--- a/src/virtManager/domain.py	Mon Mar 09 23:38:03 2009 -0400
++++ b/src/virtManager/domain.py	Fri Mar 13 11:21:07 2009 -0400
+@@ -806,7 +806,7 @@
+         def _parse_char_devs(ctx):
+             chars = []
+             devs  = []
+-            devs = ctx.xpathEval("/domain/devices/console")
++            devs.extend(ctx.xpathEval("/domain/devices/console"))
+             devs.extend(ctx.xpathEval("/domain/devices/parallel"))
+             devs.extend(ctx.xpathEval("/domain/devices/serial"))
+ 
+@@ -822,7 +822,7 @@
+                 target_port = None
+                 source_path = None
+ 
+-                for child in node.children:
++                for child in node.children or []:
+                     if child.name == "target":
+                         target_port = child.prop("port")
+                     if child.name == "source":
+# HG changeset patch
+# User Cole Robinson <crobinso@redhat.com>
+# Date 1236964404 14400
+# Node ID 7ab8a12b3527d97bc92acca7e6e6ff3fbdd9746b
+# Parent  4331403b2e66dafdda618283dcea259a66fba423
+Check what XMLDesc flags the connection supports before using them.
+
+diff -r 4331403b2e66 -r 7ab8a12b3527 src/virtManager/connection.py
+--- a/src/virtManager/connection.py	Fri Mar 13 11:21:07 2009 -0400
++++ b/src/virtManager/connection.py	Fri Mar 13 13:13:24 2009 -0400
+@@ -104,6 +104,7 @@
+         self.state = self.STATE_DISCONNECTED
+         self.vmm = None
+         self.storage_capable = None
++        self.dom_xml_flags = None
+ 
+         # Connection Storage pools: UUID -> vmmStoragePool
+         self.pools = {}
+@@ -290,6 +291,29 @@
+     def get_capabilities(self):
+         return virtinst.CapabilitiesParser.parse(self.vmm.getCapabilities())
+ 
++    def set_dom_flags(self, vm):
++        if self.dom_xml_flags != None:
++            # Already set
++            return
++
++        self.dom_xml_flags = []
++        for flags in [libvirt.VIR_DOMAIN_XML_SECURE,
++                      libvirt.VIR_DOMAIN_XML_INACTIVE,
++                      (libvirt.VIR_DOMAIN_XML_SECURE |
++                       libvirt.VIR_DOMAIN_XML_INACTIVE )]:
++            try:
++                vm.XMLDesc(flags)
++                self.dom_xml_flags.append(flags)
++            except libvirt.libvirtError, e:
++                logging.debug("%s does not support flags=%d : %s" %
++                              (self.get_uri(), flags, str(e)))
++
++    def has_dom_flags(self, flags):
++        if self.dom_xml_flags == None:
++            return False
++
++        return bool(self.dom_xml_flags.count(flags))
++
+     def is_kvm_supported(self):
+         if self.is_qemu_session():
+             return False
+diff -r 4331403b2e66 -r 7ab8a12b3527 src/virtManager/domain.py
+--- a/src/virtManager/domain.py	Fri Mar 13 11:21:07 2009 -0400
++++ b/src/virtManager/domain.py	Fri Mar 13 13:13:24 2009 -0400
+@@ -75,6 +75,10 @@
+         self.toggle_sample_network_traffic()
+         self.toggle_sample_disk_io()
+ 
++        # Determine available XML flags (older libvirt versions will error
++        # out if passed SECURE_XML, INACTIVE_XML, etc)
++        self.connection.set_dom_flags(vm)
++
+     def get_xml(self):
+         # Get domain xml. If cached xml is invalid, update.
+         if self._xml is None or not self._valid_xml:
+@@ -85,8 +89,12 @@
+         # Force an xml update. Signal 'config-changed' if domain xml has
+         # changed since last refresh
+ 
++        flags = libvirt.VIR_DOMAIN_XML_SECURE
++        if not self.connection.has_dom_flags(flags):
++            flags = 0
++
+         origxml = self._xml
+-        self._xml = self.vm.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE)
++        self._xml = self.vm.XMLDesc(flags)
+         self._valid_xml = True
+ 
+         if origxml != self._xml:
+@@ -106,8 +114,15 @@
+         return self._orig_inactive_xml
+ 
+     def refresh_inactive_xml(self):
+-        self._orig_inactive_xml = self.vm.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE | libvirt.VIR_DOMAIN_XML_SECURE)
+-        print "xml refresh to: %s" % self._orig_inactive_xml
++        flags = (libvirt.VIR_DOMAIN_XML_INACTIVE |
++                 libvirt.VIR_DOMAIN_XML_SECURE)
++        if not self.connection.has_dom_flags(flags):
++            flags = libvirt.VIR_DOMAIN_XML_INACTIVE
++
++            if not self.connection.has_dom_flags:
++                flags = 0
++
++        self._orig_inactive_xml = self.vm.XMLDesc(flags)
+ 
+     def release_handle(self):
+         del(self.vm)
+# HG changeset patch
+# User Cole Robinson <crobinso@redhat.com>
+# Date 1236969435 14400
+# Node ID 6374136c62476678cf965eaac2c2680602641371
+# Parent  403916479f503f79f23bb682698b38f595eb0626
+Fix default 'New VM' install options on older xen connections.
+
+diff -r 403916479f50 -r 6374136c6247 src/virtManager/create.py
+--- a/src/virtManager/create.py	Fri Mar 13 14:35:55 2009 -0400
++++ b/src/virtManager/create.py	Fri Mar 13 14:37:15 2009 -0400
+@@ -690,6 +690,16 @@
+         net_list.set_active(default)
+ 
+     def change_caps(self, gtype=None, dtype=None):
++
++        if gtype == None:
++            # If none specified, prefer HVM. This way, the default install
++            # options won't be limited because we default to PV. If hvm not
++            # supported, differ to guest_lookup
++            for g in self.caps.guests:
++                if g.os_type == "hvm":
++                    gtype = "hvm"
++                    break
++
+         (newg,
+          newdom) = virtinst.CapabilitiesParser.guest_lookup(conn=self.conn.vmm,
+                                                             caps=self.caps,
diff --git a/app-emulation/virt-manager/files/virt-manager-0.7.0-vm-migrate-list.patch b/app-emulation/virt-manager/files/virt-manager-0.7.0-vm-migrate-list.patch
new file mode 100644
index 000000000000..2e418ea241ad
--- /dev/null
+++ b/app-emulation/virt-manager/files/virt-manager-0.7.0-vm-migrate-list.patch
@@ -0,0 +1,64 @@
+# HG changeset patch
+# User Cole Robinson <crobinso@redhat.com>
+# Date 1237844305 14400
+# Node ID c0da7f8bb4be5ca9ace313b5e94c002248088081
+# Parent  8077dae2ea80d56914648d7508e9fcbea0690563
+Pull necessary info from vm object when building migrate list.
+
+diff -r 8077dae2ea80 -r c0da7f8bb4be src/virtManager/details.py
+--- a/src/virtManager/details.py	Fri Mar 13 14:37:57 2009 -0400
++++ b/src/virtManager/details.py	Mon Mar 23 17:38:25 2009 -0400
+@@ -727,7 +727,8 @@
+ 
+     def set_migrate_menu(self):
+         menu = self.window.get_widget("details-menu-migrate_menu")
+-        self.engine.populate_migrate_menu(menu, self.control_vm_migrate)
++        self.engine.populate_migrate_menu(menu, self.control_vm_migrate,
++                                          self.vm)
+ 
+     def set_pause_widget_states(self, state):
+         try:
+diff -r 8077dae2ea80 -r c0da7f8bb4be src/virtManager/engine.py
+--- a/src/virtManager/engine.py	Fri Mar 13 14:37:57 2009 -0400
++++ b/src/virtManager/engine.py	Mon Mar 23 17:38:25 2009 -0400
+@@ -574,8 +574,8 @@
+         migrate_progress.set_title(" ")
+         return migrate_progress
+ 
+-    def populate_migrate_menu(self, menu, migrate_func):
+-        conns = self.get_available_migrate_hostnames()
++    def populate_migrate_menu(self, menu, migrate_func, vm):
++        conns = self.get_available_migrate_hostnames(vm)
+ 
+         # Clear menu
+         for item in menu:
+@@ -597,9 +597,9 @@
+             mitem.show()
+             menu.add(mitem)
+ 
+-    def get_available_migrate_hostnames(self):
+-        driver = self.windowManager.current_connection().get_driver()
+-        uri = self.windowManager.current_connection().get_uri()
++    def get_available_migrate_hostnames(self, vm):
++        driver = vm.get_connection().get_driver()
++        uri = vm.get_connection().get_uri()
+         available_migrate_hostnames = {}
+ 
+         # Returns list of lists of the form
+diff -r 8077dae2ea80 -r c0da7f8bb4be src/virtManager/manager.py
+--- a/src/virtManager/manager.py	Fri Mar 13 14:37:57 2009 -0400
++++ b/src/virtManager/manager.py	Mon Mar 23 17:38:25 2009 -0400
+@@ -1124,7 +1124,12 @@
+                       vm.get_uuid(), hostname)
+ 
+     def set_migrate_submenu(self, src):
+-        self.engine.populate_migrate_menu(self.vmmenumigrate, self.migrate)
++        vm = self.current_vm()
++        if not vm:
++            return
++
++        self.engine.populate_migrate_menu(self.vmmenumigrate, self.migrate,
++                                          vm)
+ 
+     def _add_connection(self, engine, conn):
+         conn.connect("vm-added", self.vm_added)
diff --git a/app-emulation/virt-manager/virt-manager-0.7.0-r1.ebuild b/app-emulation/virt-manager/virt-manager-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..a902ddedd875
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-0.7.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 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.7.0-r1.ebuild,v 1.1 2009/05/28 21:24:53 cardoe Exp $
+
+EAPI=2
+
+# Stop gnome2.eclass from doing stuff on USE=debug
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="A graphical tool for administering virtual machines such as 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 +network"
+RDEPEND=">=dev-python/pygtk-1.99.12
+	>=app-emulation/libvirt-0.4.5
+	>=dev-libs/libxml2-2.6.23[python]
+	>=app-emulation/virtinst-0.400.3
+	>=gnome-base/librsvg-2
+	>=x11-libs/vte-0.12.2[python]
+	>=net-libs/gtk-vnc-0.3.4[python]
+	dev-python/dbus-python
+	dev-python/gconf-python
+	dev-python/libgnome-python
+	app-text/rarian
+	gnome-keyring? ( dev-python/gnome-keyring-python )
+	network? ( net-firewall/iptables )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-old-xen-compat.patch"
+	epatch "${FILESDIR}/${P}-vm-migrate-list.patch"
+	epatch "${FILESDIR}/${P}-fix-button-ordering.patch"
+	epatch "${FILESDIR}/${P}-fix-vcpu-cap.patch"
+	epatch "${FILESDIR}/${P}-delete-dup-conn.patch"
+}