diff options
6 files changed, 105 insertions, 77 deletions
diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog index 8aa6d45b5fab..0510c0673e14 100644 --- a/app-emulation/virt-manager/ChangeLog +++ b/app-emulation/virt-manager/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for app-emulation/virt-manager # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.43 2011/03/28 08:40:20 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.44 2011/06/07 17:11:50 cardoe Exp $ + +*virt-manager-0.8.7-r1 (07 Jun 2011) + + 07 Jun 2011; Doug Goldstein <cardoe@gentoo.org> + -files/virt-manager-0.8.2-ssh-tunnel-shutdown.patch, + -files/virt-manager-0.8.4-customize-dialog-xmlparsedoc.patch, + -files/virt-manager-0.8.4-default-keyring.patch, + +virt-manager-0.8.7-r1.ebuild, +files/virt-manager-0.8.7-vcpu-stats.patch: + Add back a patch from Michael Williams <spacex@gmail.com> that shows CPU + usage per guest instead of as a system whole. Extremely useful when you have + a 16 core host with 40 VMs running. Additionally, dropped some stale patches + from files/ *virt-manager-0.8.7 (28 Mar 2011) diff --git a/app-emulation/virt-manager/files/virt-manager-0.8.2-ssh-tunnel-shutdown.patch b/app-emulation/virt-manager/files/virt-manager-0.8.2-ssh-tunnel-shutdown.patch deleted file mode 100644 index cc7040a3e732..000000000000 --- a/app-emulation/virt-manager/files/virt-manager-0.8.2-ssh-tunnel-shutdown.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Nur virt-manager-0.8.2/src/virtManager/console.py virt-manager-0.8.2-ssh-tunnel/src/virtManager/console.py ---- virt-manager-0.8.2/src/virtManager/console.py 2009-12-14 16:40:30.000000000 -0600 -+++ virt-manager-0.8.2-ssh-tunnel/src/virtManager/console.py 2010-02-04 11:40:17.000000000 -0600 -@@ -29,6 +29,7 @@ - import gtkvnc - import os - import socket -+import signal - - from virtManager.error import vmmErrorDialog - -@@ -534,7 +535,7 @@ - logging.debug("Shutting down tunnel PID %d FD %d" % - (self.vncTunnel[1], self.vncTunnel[0].fileno())) - self.vncTunnel[0].close() -- os.waitpid(self.vncTunnel[1], 0) -+ os.kill(self.vncTunnel[1], signal.SIGTERM) - self.vncTunnel = None - - def try_login(self, src=None): 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 deleted file mode 100644 index 7d3c7c4b95bb..000000000000 --- a/app-emulation/virt-manager/files/virt-manager-0.8.4-customize-dialog-xmlparsedoc.patch +++ /dev/null @@ -1,23 +0,0 @@ - -# 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/files/virt-manager-0.8.4-default-keyring.patch b/app-emulation/virt-manager/files/virt-manager-0.8.4-default-keyring.patch deleted file mode 100644 index 2e836d7caef6..000000000000 --- a/app-emulation/virt-manager/files/virt-manager-0.8.4-default-keyring.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nur virt-manager-0.8.4/AUTHORS virt-manager-0.8.4-default-keyring//AUTHORS ---- virt-manager-0.8.4/AUTHORS 2010-03-23 13:25:27.000000000 -0500 -+++ virt-manager-0.8.4-default-keyring//AUTHORS 2010-06-15 12:19:29.000000000 -0500 -@@ -63,6 +63,7 @@ - Fred Leeflang <fredl-at-dutchie-dot-org> - Jon Nordby <jononor-at-gmail-dot-com> - Ales Zelinka <azelinka-at-redhat.com> -+ Matthias Fulz <olz1983-at-googlemail-dot-com> - - <...send a patch & get your name here...> - -diff -Nur virt-manager-0.8.4/src/virtManager/keyring.py virt-manager-0.8.4-default-keyring//src/virtManager/keyring.py ---- virt-manager-0.8.4/src/virtManager/keyring.py 2010-03-23 13:25:29.000000000 -0500 -+++ virt-manager-0.8.4-default-keyring//src/virtManager/keyring.py 2010-06-15 12:21:53.000000000 -0500 -@@ -35,11 +35,15 @@ - def __init__(self): - if haveKeyring: - try: -- if not("default" in gnomekeyring.list_keyring_names_sync()): -- gnomekeyring.create_sync("default", None) - self.keyring = gnomekeyring.get_default_keyring_sync() - if self.keyring == None: -- logging.warning("Failed to create default keyring") -+ # Code borrowed from -+ # http://trac.gajim.org/browser/src/common/passwords.py -+ self.keyring = 'default' -+ try: -+ gnomekeyring.create_sync(self.keyring, None) -+ except gnomekeyring.AlreadyExistsError: -+ pass - except: - logging.warning(("Keyring unavailable: '%s'") % (str((sys.exc_info())[0]) + " " + str((sys.exc_info())[1]))) - self.keyring = None diff --git a/app-emulation/virt-manager/files/virt-manager-0.8.7-vcpu-stats.patch b/app-emulation/virt-manager/files/virt-manager-0.8.7-vcpu-stats.patch new file mode 100644 index 000000000000..4bdca3ef7346 --- /dev/null +++ b/app-emulation/virt-manager/files/virt-manager-0.8.7-vcpu-stats.patch @@ -0,0 +1,19 @@ +diff -ur a/src/virtManager/domain.py b/src/virtManager/domain.py +--- a/src/virtManager/domain.py 2011-03-24 15:39:28.000000000 -0500 ++++ b/src/virtManager/domain.py 2011-06-07 11:33:59.000000000 -0500 +@@ -765,8 +765,12 @@ + + pcentCpuTime = ( + (cpuTime) * 100.0 / +- (((now - prevTimestamp) * 1000.0 * 1000.0 * 1000.0) * +- self.connection.host_active_processor_count())) ++ (((now - prevTimestamp) * 1000.0 * 1000.0 * 1000.0) )) ++ ++ if self.vcpu_count() > 0: ++ pcentCpuTime /= self.vcpu_count() ++ else: ++ pcentCpuTime /= self.connection.host_active_processor_count())) + + # Due to timing diffs between getting wall time & getting + # the domain's time, its possible to go a tiny bit over +Only in b/src/virtManager: domain.py.orig diff --git a/app-emulation/virt-manager/virt-manager-0.8.7-r1.ebuild b/app-emulation/virt-manager/virt-manager-0.8.7-r1.ebuild new file mode 100644 index 000000000000..e4c2e030169f --- /dev/null +++ b/app-emulation/virt-manager/virt-manager-0.8.7-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2011 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.7-r1.ebuild,v 1.1 2011/06/07 17:11:50 cardoe Exp $ + +#BACKPORTS= + +EAPI=2 + +PYTHON_DEPEND="2:2.4" + +# Stop gnome2.eclass from doing stuff on USE=debug +GCONF_DEBUG="no" + +inherit eutils gnome2 python ${HG_ECLASS} + +SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz + ${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}" +KEYWORDS="~amd64 ~x86" +VIRTINSTDEP=">=app-emulation/virtinst-0.500.6" + +DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)" +HOMEPAGE="http://virt-manager.org/" +LICENSE="GPL-2" +SLOT="0" +IUSE="gnome-keyring policykit sasl" +RDEPEND=">=dev-python/pygtk-1.99.12 + >=app-emulation/libvirt-0.7.0[python,sasl?] + >=dev-libs/libxml2-2.6.23[python] + ${VIRTINSTDEP} + >=gnome-base/librsvg-2 + >=x11-libs/vte-0.12.2:0[python] + >=net-libs/gtk-vnc-0.3.8[python,sasl?] + >=dev-python/dbus-python-0.61 + >=dev-python/gconf-python-1.99.11 + dev-python/urlgrabber + gnome-keyring? ( dev-python/gnome-keyring-python ) + policykit? ( sys-auth/polkit )" +DEPEND="${RDEPEND} + app-text/rarian + dev-util/intltool" + +src_prepare() { + sed -e "s/python/python2/" -i src/virt-manager.in || \ + die "python2 update failed" + + [[ -n ${BACKPORTS} ]] && \ + EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ + epatch + + epatch "${FILESDIR}/${P}-vcpu-stats.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 +} |