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.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64

4 files changed, 22 insertions, 9 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/Manifest b/app-emulation/virt-manager/Manifest
index fd67077a6440..967442f7318f 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,7 +1,7 @@
 DIST virt-manager-0.9.1.tar.gz 1942398 SHA256 15e064167ba5ff84ce6fc8790081d61890430f2967f89886a84095a23e40094a SHA512 d21f06e5f99a66318c58d78b8d61b6c590c5defc5eccb2d2f6b4182d1883e02a095ad7b44bef0c6c0cd32919b6670b5c41ee3c5b5d44cc592bcdd56e73f19801 WHIRLPOOL 191fda27f3e99cf38ecbc673b26be3d0aa38b0e88777f73798f6444a6463b66fba1345304af3ee2344eb31de2a34f57e48108d6191d94eb251ea0b006cf79cab
 DIST virt-manager-0.9.4.tar.gz 1709809 SHA256 dc8c553beeb15bb30cd5517b2105bcc47cf482b03523e522733c52b0e5df0fc0 SHA512 f70f4c4f0d5b282d8126e495a2da8bcb6afe0bcbbae493d4abb46c3a1802f5ce36f477125421cb577ab2f64bae522db4d7c03558fa7997d74f5060b29b98c53a WHIRLPOOL 00a213515f23858278f47069102cf82eb053255b81a9e128fd666dbb17f6d9e7ce2365b4370fa3b733406c07599fe5c0dfa076a6555c48dd62d1178b679acedb
 EBUILD virt-manager-0.9.1.ebuild 2519 SHA256 9c308ebb05d3feafdcd494531308770a1290b4bce6a643ff2d9bb20b0fb29fe0 SHA512 331aa845cc74d45cb28659d99e6783bb076b1ecdb54767cd1c91ba2745dd4fa27c46ee73cc6597cfa90d40075a1e8203b4a66b95ed7bb4192727e4633feebd42 WHIRLPOOL 1f2f9eb8178293eae0a6a667427acbfb77894fda177fed53dc131ac96bbecf2bac9dc2c4398637cafd5479c4f7e17a0ac8db7979ddbcedfb33fd9da3f18b383c
-EBUILD virt-manager-0.9.4.ebuild 2516 SHA256 cf6c675ebfc576482807518055a7b2d0163565f2b45016204f4b090c53f7246b SHA512 2fb7d2efed11cbcd2f5bc0cb0b1cac43ed550011d78ec1b59484c4dda8169ad2d747d5115c277bd2a20a31c6d6372656db7ae5caa465094e1ae55cda4092bf47 WHIRLPOOL 29907785304130f1745a25ba15f667e0b206159cac80f98d8fa855ee105b586c638c7fa45fc2d2e05935fb3bf3c01444f6da836de596c349a76af369ba1a72e2
+EBUILD virt-manager-0.9.4.ebuild 2637 SHA256 19ed20461bb287a5b8151f38dbbe2872886530de9f39ba4161f16b5d14d84c45 SHA512 1928a1dbf62c9305869240ab2fe68a587df1da8090ac45dcc37dafd873ded38ff120a2efee09cd0bb11ce065f5d9685a58159360c24469dea2b3fa5bef72e72e WHIRLPOOL d5ef815c13bf084218e9e66da6b949c38ac4f24e219b6b80f6bf7ac4b9dfdf43048cc9db033e671a624ab4f3b748b63079b95baef9ddb9a2845b9c358af2cb47
 EBUILD virt-manager-9999.ebuild 2459 SHA256 dc91b22f727b2ed436b68a8d8dc93b5f23396ce556629d5782b0b91be39a19db SHA512 0644c28e29afdaf27447237e469221f10b64b4ccd18821fb9e02a555172720ad987a14b74e160a7564f81a96a4bcd5038f7bbe4aa3929e91468732b46aebd82f WHIRLPOOL fa59a342212cdbacc2e6dae4cd0e04e6a0c6501c29ab679945e16042e7f3080fd323e9187c994f2f36fdcc2edcf4293273bf6a04c101144e3cfbc3e7d6eb1c25
-MISC ChangeLog 14237 SHA256 d5b95446a987ae75d76da8b0bfc20afc8e1801d2c37c97526697e48045c4d0e1 SHA512 7cc3ffb8a4e748ed34a087dc37157d68409b0d8a1a41b4554693e5531a4182b706d7bb6866c93de7ca8a68e118d7c0b916f45ca4e1bf4e9bbd31507411c99a3f WHIRLPOOL 7b0c7241830198cc82e200a813261ac6dd1c49daee7492007b991b60b4d0b9dba295a688146f9c101c8bae8d30ccdf2b0c66cf4c0942fba8df34a7795dfb798a
-MISC metadata.xml 641 SHA256 3d4ac13637c95e0524006f0cbaf690d4dc8d3f7faf2e36581be8730aba6cc672 SHA512 29a2b310305f9ca3abb4d103c04c84b605006cdcbdf461ea0ee4a9da08bc1a3495632ce212835bc64e5b0da86e3eb78f25125e5d462548be8b032b5a7300902a WHIRLPOOL e34c2b3a5bcafae7ee45d457b9e574b09e1d683c013e29610ba0810657377c3a7c6382a04be3adb1c4edaffdd8c33fbce773113eda47070f10671576ea2ce568
+MISC ChangeLog 14491 SHA256 6dec32ea530a91dd7cdefad36a4965700d578355d44b4a17863fddfc74b23cb2 SHA512 6e96b38ac3f0522cfbbaade73369b8efe28b20c958b24195da08343fedd2cd7e3fd60c038a3dab0a37f42c96fba31039ab03cfe8d5edc8a3e881c59f991425c4 WHIRLPOOL 0ed84dafee6dfdb1053d6ab5ffcb9fbafe96fb7967bb7635e9e5cfe3dc13dae947e6b84eb353c352db5ae20d42cfbf7f24ec835e8569cda0fa2868597c075d54
+MISC metadata.xml 722 SHA256 70795a507d431d9f6682777a65b480eeb0d762368f3150552b7d17bf98f96bed SHA512 1a6cb74025b5f750c82f7c373638a764f19057bbb076e96688f73690362ef197d8a38333873f8ec5baaa9cdf11a0848c83c1d86403f17b70347d7f6ca8fcbe3f WHIRLPOOL 5a3b8cbfbdbada615803ac5e6cf3a21ebc6f5d15ee1d440be6de3efcd129557c6651aac91192b8b94ed7171e856cc564e9f49c7c5b6d425d2b778621f644c7ef
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