Add USE=tk to control support for the -gui option #362721 by victor romanchuk.

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

3 files changed, 14 insertions, 9 deletions

diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog
index 3700eae983a1..2fb447dd2f4c 100644
--- a/x11-misc/x11vnc/ChangeLog
+++ b/x11-misc/x11vnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/x11vnc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.93 2010/12/22 18:25:24 swegener Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.94 2011/04/09 17:42:02 vapier Exp $
+
+  09 Apr 2011; Mike Frysinger <vapier@gentoo.org> x11vnc-0.9.12.ebuild,
+  metadata.xml:
+  Add USE=tk to control support for the -gui option #362721 by victor
+  romanchuk.
 
   22 Dec 2010; Sven Wegener <swegener@gentoo.org> x11vnc-0.9.9.ebuild,
   x11vnc-0.9.10.ebuild, x11vnc-0.9.11.ebuild, x11vnc-0.9.12.ebuild:
diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml
index 7f2fe58037af..325d2bea824a 100644
--- a/x11-misc/x11vnc/metadata.xml
+++ b/x11-misc/x11vnc/metadata.xml
@@ -12,5 +12,6 @@ server utility that allows a VNC viewer to connect to an actual X display.
 	</longdescription>
   <use>
     <flag name="system-libvncserver">Build x11vnc against the system libvncserver (experimental)</flag>
+    <flag name="tk">Support the simple tcl/tk -gui option</flag>
   </use>
 </pkgmetadata>
diff --git a/x11-misc/x11vnc/x11vnc-0.9.12.ebuild b/x11-misc/x11vnc/x11vnc-0.9.12.ebuild
index 1e2e852f2561..e3d6dad41b7b 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.12.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.12.ebuild,v 1.3 2010/12/22 18:25:24 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.12.ebuild,v 1.4 2011/04/09 17:42:02 vapier Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/libvncserver/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="fbcon +jpeg +zlib threads ssl crypt v4l xinerama avahi system-libvncserver"
+IUSE="avahi crypt fbcon +jpeg ssl system-libvncserver threads tk v4l xinerama +zlib"
 
 RDEPEND="system-libvncserver? ( >=net-libs/libvncserver-0.9.7[threads=,jpeg=,zlib=] )
 	!system-libvncserver? (
@@ -21,6 +21,7 @@ RDEPEND="system-libvncserver? ( >=net-libs/libvncserver-0.9.7[threads=,jpeg=,zli
 		jpeg? ( virtual/jpeg:0 )
 	)
 	ssl? ( dev-libs/openssl )
+	tk? ( dev-lang/tk )
 	avahi? ( >=net-dns/avahi-0.6.4 )
 	xinerama? ( x11-libs/libXinerama )
 	x11-libs/libXfixes
@@ -29,7 +30,6 @@ RDEPEND="system-libvncserver? ( >=net-libs/libvncserver-0.9.7[threads=,jpeg=,zli
 	>=x11-libs/libXtst-1.1.0
 	x11-libs/libXdamage
 	x11-libs/libXext"
-
 DEPEND="${RDEPEND}
 	x11-libs/libXt
 	xinerama? ( x11-proto/xineramaproto )
@@ -40,8 +40,7 @@ DEPEND="${RDEPEND}
 	x11-proto/xextproto"
 
 pkg_setup() {
-	if use avahi && ! use threads
-	then
+	if use avahi && ! use threads ; then
 		ewarn "Non-native avahi support has been enabled."
 		ewarn "Native avahi support can be enabled by also enabling the threads USE flag."
 	fi
@@ -67,7 +66,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc x11vnc/{ChangeLog,README}
 	# Remove include files, which conflict with net-libs/libvncserver
 	rm -rf "${D}"/usr/include