summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2009-06-09 13:32:59 +0000
committerDoug Goldstein <cardoe@gentoo.org>2009-06-09 13:32:59 +0000
commitdcb1f6e68da06c2811fd63a1a3d8f9dc960d600d (patch)
tree4e711c824a2408302bf58f4b91c1ca6e4914af7c /app-emulation/virt-manager
parentAvoid installing ABOUT-NLS file. (diff)
downloadhistorical-dcb1f6e68da06c2811fd63a1a3d8f9dc960d600d.tar.gz
historical-dcb1f6e68da06c2811fd63a1a3d8f9dc960d600d.tar.bz2
historical-dcb1f6e68da06c2811fd63a1a3d8f9dc960d600d.zip
clean up old versions
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'app-emulation/virt-manager')
-rw-r--r--app-emulation/virt-manager/ChangeLog9
-rw-r--r--app-emulation/virt-manager/files/virt-manager-0.5.4-polkit-root.patch14
-rw-r--r--app-emulation/virt-manager/files/virt-manager-0.6.0-read-only-fallback.patch77
-rw-r--r--app-emulation/virt-manager/virt-manager-0.6.0-r1.ebuild54
-rw-r--r--app-emulation/virt-manager/virt-manager-0.7.0.ebuild32
5 files changed, 8 insertions, 178 deletions
diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index f035d9a17cc4..c0fa23ab692c 100644
--- a/app-emulation/virt-manager/ChangeLog
+++ b/app-emulation/virt-manager/ChangeLog
@@ -1,6 +1,13 @@
# 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.15 2009/06/01 15:04:24 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.16 2009/06/09 13:32:59 cardoe Exp $
+
+ 09 Jun 2009; Doug Goldstein <cardoe@gentoo.org>
+ -files/virt-manager-0.5.4-polkit-root.patch,
+ -virt-manager-0.6.0-r1.ebuild,
+ -files/virt-manager-0.6.0-read-only-fallback.patch,
+ -virt-manager-0.7.0.ebuild:
+ clean up old versions
01 Jun 2009; Jeremy Olexa <darkside@gentoo.org>
-virt-manager-0.5.1.ebuild, -virt-manager-0.5.4.ebuild:
diff --git a/app-emulation/virt-manager/files/virt-manager-0.5.4-polkit-root.patch b/app-emulation/virt-manager/files/virt-manager-0.5.4-polkit-root.patch
deleted file mode 100644
index 6d42ca25fda2..000000000000
--- a/app-emulation/virt-manager/files/virt-manager-0.5.4-polkit-root.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -rup virt-manager-0.5.4.orig/src/virtManager/connection.py virt-manager-0.5.4/src/virtManager/connection.py
---- virt-manager-0.5.4.orig/src/virtManager/connection.py 2008-03-10 20:17:51.000000000 -0400
-+++ virt-manager-0.5.4/src/virtManager/connection.py 2008-03-13 13:51:14.000000000 -0400
-@@ -336,6 +336,9 @@ class vmmConnection(gobject.GObject):
- self.connectThread.start()
-
- def _do_creds_polkit(self, action):
-+ if os.getuid() == 0:
-+ logging.debug("Skipping policykit check as root")
-+ return 0
- logging.debug("Doing policykit for %s" % action)
- bus = dbus.SessionBus()
- obj = bus.get_object("org.gnome.PolicyKit", "/org/gnome/PolicyKit/Manager")
-Only in virt-manager-0.5.4/src/virtManager: connection.py~
diff --git a/app-emulation/virt-manager/files/virt-manager-0.6.0-read-only-fallback.patch b/app-emulation/virt-manager/files/virt-manager-0.6.0-read-only-fallback.patch
deleted file mode 100644
index f270810dd27a..000000000000
--- a/app-emulation/virt-manager/files/virt-manager-0.6.0-read-only-fallback.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- virt-manager-0.6.0/src/virtManager/connection.py.orig 2008-09-10 15:37:12.000000000 -0400
-+++ virt-manager-0.6.0/src/virtManager/connection.py 2008-12-01 22:33:34.000000000 -0500
-@@ -38,11 +38,6 @@
- from virtManager.netdev import vmmNetDevice
- from virtManager.storagepool import vmmStoragePool
-
--LIBVIRT_POLICY_FILES = [
-- "/usr/share/PolicyKit/policy/libvirtd.policy",
-- "/usr/share/PolicyKit/policy/org.libvirt.unix.policy"
--]
--
- def get_local_hostname():
- try:
- (host, aliases, ipaddrs) = gethostbyaddr(gethostname())
-@@ -139,15 +134,6 @@
- self.uri = "xen:///"
-
- self.readOnly = readOnly
-- if not self.is_remote() and os.getuid() != 0 and self.uri != "qemu:///session":
-- hasPolkit = False
-- for f in LIBVIRT_POLICY_FILES:
-- if os.path.exists(f):
-- hasPolkit = True
--
-- if not hasPolkit:
-- self.readOnly = True
--
- self.state = self.STATE_DISCONNECTED
- self.vmm = None
- self.storage_capable = None
-@@ -464,8 +450,7 @@
- logging.error(self.connectError)
- return -1
-
-- def _open_thread(self):
-- logging.debug("Background thread is running")
-+ def _try_open(self):
- try:
- flags = 0
- if self.readOnly:
-@@ -478,12 +463,34 @@
- libvirt.VIR_CRED_EXTERNAL],
- self._do_creds,
- None], flags)
-+ except:
-+ exc_info = sys.exc_info()
-+
-+ # If the previous attempt was read/write try to fall back
-+ # on read-only connection, otherwise report the error.
-+ if not self.readOnly:
-+ try:
-+ self.vmm = libvirt.openReadOnly(self.uri)
-+ self.readOnly = True
-+ logging.info("Read/write connection failed to %s,"
-+ "falling back on read-only." % self.uri)
-+ return
-+ except:
-+ pass
-+
-+ return exc_info
-
-+ def _open_thread(self):
-+ logging.debug("Background thread is running")
-+
-+ open_error = self._try_open()
-+
-+ if not open_error:
- self.state = self.STATE_ACTIVE
-- except:
-+ else:
- self.state = self.STATE_DISCONNECTED
-
-- (type, value, stacktrace) = sys.exc_info ()
-+ (type, value, stacktrace) = open_error
- # Detailed error message, in English so it can be Googled.
- self.connectError = \
- ("Unable to open connection to hypervisor URI '%s':\n" %
diff --git a/app-emulation/virt-manager/virt-manager-0.6.0-r1.ebuild b/app-emulation/virt-manager/virt-manager-0.6.0-r1.ebuild
deleted file mode 100644
index a4b22a8a39f3..000000000000
--- a/app-emulation/virt-manager/virt-manager-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 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.6.0-r1.ebuild,v 1.1 2008/12/02 03:38:10 marineam Exp $
-
-# 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"
-RDEPEND=">=dev-python/pygtk-1.99.12
- >=app-emulation/libvirt-0.4.5
- >=dev-libs/libxml2-2.6.23
- >=app-emulation/virtinst-0.400.0
- >=gnome-base/librsvg-2
- >=x11-libs/vte-0.12.2
- >=net-libs/gtk-vnc-0.3.4
- dev-python/dbus-python
- dev-python/gconf-python
- dev-python/libgnome-python
- gnome-keyring? ( dev-python/gnome-keyring-python )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- if ! built_with_use dev-libs/libxml2 python; then
- local msg="You must install libxml2 with USE=python."
- eerror "$msg"
- die "$msg"
- fi
-
- if ! built_with_use x11-libs/vte python; then
- local msg="You must install vte with USE=python."
- eerror "$msg"
- die "$msg"
- fi
-
- if ! built_with_use net-libs/gtk-vnc python; then
- local msg="You must install gtk-vnc with USE=python."
- eerror "$msg"
- die "$msg"
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${P}-read-only-fallback.patch"
-}
diff --git a/app-emulation/virt-manager/virt-manager-0.7.0.ebuild b/app-emulation/virt-manager/virt-manager-0.7.0.ebuild
deleted file mode 100644
index 6cb91440c1ce..000000000000
--- a/app-emulation/virt-manager/virt-manager-0.7.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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.ebuild,v 1.2 2009/05/20 17:51:59 dertobi123 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}"