Update depends to handle dual gtk2/gtk3 support in spice-gtk. Added USE=vnc enabled by default and make USE=spice enabled by default to best support all kinds of VMs.

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 19 insertions, 6 deletions

diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index f8ae3976a46f..4e226a75e9fe 100644
--- a/app-emulation/virt-manager/ChangeLog
+++ b/app-emulation/virt-manager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/virt-manager
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.75 2012/10/15 10:06:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.76 2012/12/04 23:16:49 cardoe Exp $
+
+  04 Dec 2012; Doug Goldstein <cardoe@gentoo.org> virt-manager-0.9.4.ebuild:
+  Update depends to handle dual gtk2/gtk3 support in spice-gtk. Added USE=vnc
+  enabled by default and make USE=spice enabled by default to best support all
+  kinds of VMs.
 
   15 Oct 2012; Agostino Sarubbo <ago@gentoo.org> virt-manager-0.9.4.ebuild:
   Stable for amd64, wrt bug #437204
diff --git a/app-emulation/virt-manager/metadata.xml b/app-emulation/virt-manager/metadata.xml
index 28dcc7d8d2b8..57c6f5ecc633 100644
--- a/app-emulation/virt-manager/metadata.xml
+++ b/app-emulation/virt-manager/metadata.xml
@@ -8,7 +8,6 @@
       required when using <pkg>app-emulation/libvirt</pkg> with
       PolicyKit authentication
     </flag>
-
     <flag name='sasl'>
       Depend on the proper libraries needed to connect to SASL-enabled
       libvirtd instances (e.g. Kerberos-protected instances).
@@ -16,5 +15,8 @@
 	<flag name='spice'>
 		Support connecting to SPICE-enabled virtual machines.
 	</flag>
+	<flag name='vnc'>
+		Support connecting to VNC-enabled virtual machines.
+	</flag>
   </use>
 </pkgmetadata>
diff --git a/app-emulation/virt-manager/virt-manager-0.9.4.ebuild b/app-emulation/virt-manager/virt-manager-0.9.4.ebuild
index 08896c389493..075c5db5bce7 100644
--- a/app-emulation/virt-manager/virt-manager-0.9.4.ebuild
+++ b/app-emulation/virt-manager/virt-manager-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.9.4.ebuild,v 1.2 2012/10/15 10:06:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.9.4.ebuild,v 1.3 2012/12/04 23:16:49 cardoe Exp $
 
 EAPI=4
 
@@ -34,20 +34,26 @@ 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 spice"
+IUSE="gnome-keyring policykit sasl +spice +vnc"
 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 )
-	spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] )"
+	spice? (
+		>=net-misc/spice-gtk-0.6[python,sasl?]
+		|| (
+			<=net-misc/spice-gtk-0.14[python,sasl?,-gtk3]
+			>=net-misc/spice-gtk-0.14-r1[python,sasl?]
+		)
+	)
+	vnc? ( >=net-libs/gtk-vnc-0.3.8[python,sasl?] )"
 #	tui? ( >=dev-python/new_syrup-0.1.2 )"
 DEPEND="${RDEPEND}
 	app-text/rarian