Add a USE flag for VNC support which is on by default. This is for SPICE only users that don't want VNC support.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 23 insertions, 8 deletions

diff --git a/app-emulation/virt-viewer/ChangeLog b/app-emulation/virt-viewer/ChangeLog
index fadb787c4926..958256b549d7 100644
--- a/app-emulation/virt-viewer/ChangeLog
+++ b/app-emulation/virt-viewer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/virt-viewer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/ChangeLog,v 1.10 2012/01/18 20:21:06 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/ChangeLog,v 1.11 2012/01/18 20:27:11 cardoe Exp $
+
+  18 Jan 2012; Doug Goldstein <cardoe@gentoo.org> virt-viewer-0.4.2.ebuild,
+  metadata.xml:
+  Add a USE flag for VNC support which is on by default. This is for SPICE only
+  users that don't want VNC support.
 
 *virt-viewer-0.4.2 (18 Jan 2012)
 
diff --git a/app-emulation/virt-viewer/Manifest b/app-emulation/virt-viewer/Manifest
index 8e926ed2fc67..dbea43559a60 100644
--- a/app-emulation/virt-viewer/Manifest
+++ b/app-emulation/virt-viewer/Manifest
@@ -2,6 +2,6 @@ AUX virt-viewer-0.2.0-xulrunner-1.9.1.patch 795 RMD160 32cece797c9170a22c8774659
 DIST virt-viewer-0.2.0.tar.gz 329012 RMD160 0426c11c7430580fff089ccecb5e46d5dc515555 SHA1 65a0928cee2177decb68767f9f5ab8c4cb4f1af0 SHA256 9772a9e2b55f7d4eeae012964c594c4f96129b130ed34004fa42033bc9ad1352
 DIST virt-viewer-0.4.2.tar.gz 442244 RMD160 f1094a374b0d808af77ba992fd12ba38c25a0623 SHA1 3b1d253c3c5f9cc89786e601e40a6ac72e52d4ee SHA256 32057e115ee53d9894af05ac4659893dc7e6ff9efba8d74999147b1bfda1439c
 EBUILD virt-viewer-0.2.0-r2.ebuild 932 RMD160 8ab4b84ac85a99072e24a6cdd2db8285ddd30a73 SHA1 d98614f335277f2652daee9ace2d2ad6dbe73f0c SHA256 68d5d78ce25958851212738fc8973bcd6d0a54638385f369eb826470dd640c3b
-EBUILD virt-viewer-0.4.2.ebuild 1037 RMD160 55cea596508e04260fc4c7d739e634082342059c SHA1 29e39a677adccf34988e42b34cdc6185cadaed26 SHA256 b57c5bfdf9a737f60fe6c9ae00c8613014294a9199e9b382222206b4b4146a45
-MISC ChangeLog 1766 RMD160 98cad1f8cdb09c3aa5d439cc6171315f9e064c0f SHA1 00241c81a1fe74410b0d0242380e38d1fca70063 SHA256 35e80e64b8cf9a0f8a2df2c1062e102739e7e01291b168a91ecf7e6b38b52fb5
-MISC metadata.xml 377 RMD160 f1686f3176fbbff8d354a403a8fa98d88484e0ed SHA1 bf8a090f61363d0383a6c5097f2d8adaf4159177 SHA256 ea15c9d7e88143bc5f2ed9f17134ee777717d1ddb73b5bce9d06c01a9b500e5b
+EBUILD virt-viewer-0.4.2.ebuild 1260 RMD160 e421bcc119e6765f38ab4d6953b15e1ff995e4bd SHA1 834f1ed9c3c3777c738b87f75ac3aad026a12856 SHA256 c0c94bae9efd726ac70db53baa5e37fa64da45aa78bc624549818df2e0875e7f
+MISC ChangeLog 1976 RMD160 388615cb12f8a0b09cac36b59e45010ca286eaf5 SHA1 2578f9c15e48f9aee55c783d25ffec14dca30531 SHA256 712983a459f37d69134515f1ab5e7e5b1f383315398018c80d845093dbf8a060
+MISC metadata.xml 458 RMD160 b2da4655fe9f03fa5a2c9d74b6ab64b51002b3d2 SHA1 5e084322b3ac4b50f622e7a7155c3a6856818693 SHA256 8ed1c7a57660494a298c83bfd496954a3676b992317363e2cb5f2a4aec0b9345
diff --git a/app-emulation/virt-viewer/metadata.xml b/app-emulation/virt-viewer/metadata.xml
index 0c775732fc50..7df3f1058c06 100644
--- a/app-emulation/virt-viewer/metadata.xml
+++ b/app-emulation/virt-viewer/metadata.xml
@@ -7,6 +7,8 @@
 			<pkg>x11-libs/gtk+:2</pkg></flag>
 		<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-viewer/virt-viewer-0.4.2.ebuild b/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild
index c308e12ffa3a..b49112f79e4a 100644
--- a/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-0.4.2.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-viewer/virt-viewer-0.4.2.ebuild,v 1.1 2012/01/18 20:21:06 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild,v 1.2 2012/01/18 20:27:11 cardoe Exp $
 
 EAPI=4
 
@@ -12,20 +12,28 @@ SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk3 nsplugin sasl spice"
+IUSE="gtk3 nsplugin sasl spice +vnc"
 RDEPEND=">=app-emulation/libvirt-0.6.0
-	>=net-libs/gtk-vnc-0.4.3
 	>=dev-libs/libxml2-2.6.0:2
 	gtk3? ( x11-libs/gtk+:3 )
 	!gtk3? ( >=x11-libs/gtk+-2.10.0:2
 			>=gnome-base/libglade-2.6.0:2.0 )
 	nsplugin? ( >=dev-libs/nspr-4.0.0
 				>=net-libs/xulrunner-1.9.1:1.9 )
-	spice? ( >=net-misc/spice-gtk-0.6[sasl?,gtk3?] )"
+	spice? ( >=net-misc/spice-gtk-0.6[sasl?,gtk3?] )
+	vnc? ( >=net-libs/gtk-vnc-0.4.3 )"
 DEPEND="${RDEPEND}"
 
+pkg_pretend() {
+	if ! use spice && ! use vnc; then
+		eerror "You must have USE=vnc or USE=spice enabled."
+		die "You must have USE=vnc or USE=spice enabled."
+	fi
+}
+
 pkg_setup() {
 	G2CONF="$(use_enable nsplugin plugin) $(use_with spice spice-gtk)"
+	G2CONF="${G2CONF} $(use_with vnc gtk-vnc)"
 	use gtk3 && G2CONF="${G2CONF} --with-gtk=3.0"
 	use gtk3 || G2CONF="${G2CONF} --with-gtk=2.0"
 }