Fix issue with default keyring usage. Fixes upstream: https://bugzilla.redhat.com/show_bug.cgi?id=603954 and bug #324027

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 106 insertions, 1 deletions

diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index 704ef6f84bcd..8c887cc9b0f3 100644
--- a/app-emulation/virt-manager/ChangeLog
+++ b/app-emulation/virt-manager/ChangeLog
@@ -1,6 +1,14 @@
 # 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.32 2010/06/12 22:55:23 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.33 2010/06/15 17:29:16 cardoe Exp $
+
+*virt-manager-0.8.4-r2 (15 Jun 2010)
+
+  15 Jun 2010; Doug Goldstein <cardoe@gentoo.org>
+  +virt-manager-0.8.4-r2.ebuild,
+  +files/virt-manager-0.8.4-default-keyring.patch:
+  Fix issue with default keyring usage. Fixes upstream:
+  https://bugzilla.redhat.com/show_bug.cgi?id=603954 and bug #324027
 
   12 Jun 2010; Doug Goldstein <cardoe@gentoo.org>
   +files/virt-manager-0.8.2-ssh-tunnel-shutdown.patch:
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
new file mode 100644
index 000000000000..2e836d7caef6
--- /dev/null
+++ b/app-emulation/virt-manager/files/virt-manager-0.8.4-default-keyring.patch
@@ -0,0 +1,33 @@
+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/virt-manager-0.8.4-r2.ebuild b/app-emulation/virt-manager/virt-manager-0.8.4-r2.ebuild
new file mode 100644
index 000000000000..8c50e17c8fcd
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-0.8.4-r2.ebuild
@@ -0,0 +1,64 @@
+# 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-r2.ebuild,v 1.1 2010/06/15 17:29:16 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
+	epatch "${FILESDIR}"/${P}-default-keyring.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
+}