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

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 20 insertions, 5 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/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"
 }