remove a bunch of patches for versions no longer in tree

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

6 files changed, 3 insertions, 612 deletions

diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 3e78fbf14f24..e7d608a13daf 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,11 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-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
 AUX virt-manager-0.8.2-ssh-tunnel-shutdown.patch 771 RMD160 adea4c43aca12e0d0000b77ffbca5bce5d079735 SHA1 c75731bde811b9e1ee3016e7a977d228dca6a708 SHA256 5ffbb3be721468e0a4e8e7bef34db26a83e29bb118db10015605956f436c40e0
 DIST virt-manager-0.8.2.tar.gz 2137638 RMD160 56b2b6218b0291d4cfa792970e7fe3e06892a2aa SHA1 2b5b80486e3c526793f05ad5db223c15c0c10b65 SHA256 8aec4721132edb38efbaa208e5e157f5b3a0bcfff26d728a7853c8e85c257a00
 EBUILD virt-manager-0.8.2-r1.ebuild 1102 RMD160 cd650e4eea02b5705c32383997b67861a1b39645 SHA1 91bbd06b4ceca05f20e079826d135141d7e1b209 SHA256 592876bb03bcaacd49adbf58d73c2c3e58a13ab61ed0f05aedec17e2b360a396
@@ -15,7 +10,7 @@ MISC metadata.xml 169 RMD160 8c3a83aab0bc71fd088038ee84f7e517a2b60f26 SHA1 1660e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktrCIMACgkQoeSe8B0zEfzefACfZd/s9eGVjC4Lxngtq7vJK8Eo
-CU4AnAideXW+JHFgBbFjTdjATjT6iLYd
-=Lgze
+iEYEARECAAYFAktrCP4ACgkQoeSe8B0zEfyQ3gCfY4MwXt7BvsE+3nbL0z4hPg8i
+mB0An0Jbm+SMN6lGG+KzaIrpBsyRzr9b
+=Kizl
 -----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
deleted file mode 100644
index 827e4a577394..000000000000
--- a/app-emulation/virt-manager/files/virt-manager-0.7.0-delete-dup-conn.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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
deleted file mode 100644
index d8f4d34be49c..000000000000
--- a/app-emulation/virt-manager/files/virt-manager-0.7.0-fix-button-ordering.patch
+++ /dev/null
@@ -1,305 +0,0 @@
-# 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
deleted file mode 100644
index 2bc90814dc30..000000000000
--- a/app-emulation/virt-manager/files/virt-manager-0.7.0-fix-vcpu-cap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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
deleted file mode 100644
index cb05c3db379d..000000000000
--- a/app-emulation/virt-manager/files/virt-manager-0.7.0-old-xen-compat.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-# 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
deleted file mode 100644
index 2e418ea241ad..000000000000
--- a/app-emulation/virt-manager/files/virt-manager-0.7.0-vm-migrate-list.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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)