Version bump, bug #334483.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 366 insertions, 2 deletions

diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog
index 45a8fd96a6e5..d6777a1052ba 100644
--- a/x11-misc/x11vnc/ChangeLog
+++ b/x11-misc/x11vnc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.86 2010/08/02 19:03:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.87 2010/08/28 10:31:14 swegener Exp $
+
+*x11vnc-0.9.11 (28 Aug 2010)
+
+  28 Aug 2010; Sven Wegener <swegener@gentoo.org> +x11vnc-0.9.11.ebuild,
+  +files/x11vnc-0.9.11-rename-pointer.patch:
+  Version bump, bug #334483.
 
   02 Aug 2010; Raúl Porcel <armin76@gentoo.org> x11vnc-0.9.9.ebuild:
   alpha/ia64/sh/sparc stable wrt #304493
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index b37a52105765..ee196ab276c7 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,14 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX x11vnc-0.9.11-rename-pointer.patch 9787 RMD160 4f029f172fe45b39d82aebdc50aaa49a797ffedc SHA1 139645d33fb7a926380a05e927ac390134c9a381 SHA256 061878de912b01c73dc597a5985b70cf95acdecfe679b0015f87f7e4d0f00f38
 AUX x11vnc-0.9.8-xshm-header-fix.patch 416 RMD160 9306882e7b7a37c15a631852e4e5b4e37892086d SHA1 60e4dc73d5c01415bc223b4ee1e9437686c7f669 SHA256 8bd28c5d43bb85c0e6e1c508d5c933333b9aef9c6dbd0029350669103a85db8a
 DIST x11vnc-0.9.10.tar.gz 2739576 RMD160 4c8864701703b04c4710100e95372786c414f9ed SHA1 ec7082ee48f1aca0597208bc29197d56a2ff3bff SHA256 935158155828b6a5990a8407ca73ea9cd428e0466a10bb39063c9247806ae011
+DIST x11vnc-0.9.11.tar.gz 2754816 RMD160 92a00aa0a4a529a42ba33f34db84ba05454e3d39 SHA1 f24d747f3fbffc9740cfedbab0b39ea6da0c817d SHA256 fbc7a9e6d38afcfbb832d48ea4084823fa6bb9c0e37a925898229ca73639e7f5
 DIST x11vnc-0.9.6.tar.gz 2461744 RMD160 5587d325fc9a3d735e653fefa2e4425c9e737477 SHA1 2cc67604a8a4bb0c40738f3bdf7295dee9637eb3 SHA256 35cf292b9f46142ddfb5ec5ae169d2ec33f2e4fa68cc7f49a0d98cac55727e1a
 DIST x11vnc-0.9.7.tar.gz 2528334 RMD160 e9eec21ca31b5ec215898624057edc6bd275edcb SHA1 0ce3a0dd83694fddd64d262320ab7d2edb5310cc SHA256 fd21224ec09ca5294ba0627433e4d2cb726d389c7818d162f152374e6d693342
 DIST x11vnc-0.9.8.tar.gz 2566632 RMD160 5f7b5ab835657c03b05b854720da5ad59b25a2b1 SHA1 0cdcd5ce05ea4c00bb7515a1949344c32a95dffc SHA256 235549a5dad84c20c6d4aba920d95e3b98999b91ca5347bdde22fa0326818342
 DIST x11vnc-0.9.9.tar.gz 2671958 RMD160 1b1335253c1f40f69ffbfdff5c4c5f28ed6315c3 SHA1 deb0c71cc0f7d6b99fb4b1484232aa935fe62c90 SHA256 6b960267b1f842efe5fb76b5d36fbee79ca8ea31528ee83877623e1cca0fbbe9
 EBUILD x11vnc-0.9.10.ebuild 1851 RMD160 718fbbc49eaa5dfdb82db5f0ac914a83965af225 SHA1 3ccb3ae198f6e8b195daced506ab4c5f0fa4673f SHA256 101c2b54d6310c743317d4b69c588f311e0efbd592dcd2747cf06204a9d609cc
+EBUILD x11vnc-0.9.11.ebuild 1908 RMD160 80bb9af705fee2f8e3b49a248d1a2b350b2f48e0 SHA1 0c25af501f240fe633fa9eaa6fb5b48672e01a4c SHA256 027c137ccaab6b92b8b4ddb674d7ddb8cac61dfc78e7ddd55974614297a7e47c
 EBUILD x11vnc-0.9.6.ebuild 1890 RMD160 d336ebbe60f013992d0d09cc9fbdf15e145b0778 SHA1 ecacd0261a3b082ca875b1b65fde5fa2c5a9bf74 SHA256 578020675f7cbb3da3e99d3f3b72af8aaf8f8b9060ebb46882c612038b61e8e5
 EBUILD x11vnc-0.9.7.ebuild 1884 RMD160 e17753d0377e41f12961b5f7331e3e3d5f5b7fd2 SHA1 7a20ebea61b5b232c4ad44987fe159e3195de10e SHA256 f2e9b2d186eac440445d5c437b0b05270a266bf5a1f40506d125b5b1d308b183
 EBUILD x11vnc-0.9.8-r1.ebuild 1849 RMD160 e719fc187466ed2af7d6668fbd9c175ec2474bf1 SHA1 af6f6b3bb1efc13fe0d035b570629fd7c2d60a88 SHA256 016d69e64cce0df527f78d5881276d2c173e9244e125a34717184ad224ff7f25
 EBUILD x11vnc-0.9.8.ebuild 1884 RMD160 8a0765ce57f845d79e56ab8ab0400e870a787783 SHA1 25681e358b7f55b9bf28efcd4afde0319ec20b81 SHA256 ba08683961efb1662f8d614fbb1eef174328bb7bb1ef6b0ce295e8acaa9ce649
 EBUILD x11vnc-0.9.9.ebuild 1840 RMD160 a197a7a739850f00997ce51491ba89de34d83b47 SHA1 b2f551132a18fafbc3f4254e31e63ab379070e12 SHA256 a061969e8ed0dfa2f4bb21f22faa87900e3f3633515b5a88e2e60e211cfdd806
-MISC ChangeLog 11312 RMD160 62b47015ed28bf4ea2be99a116b978b6aa0eed85 SHA1 60c3d7dcad28724a5d07bc2af700baa0e9f7e7d6 SHA256 34f402c1302c7ef2319280a873eb09c1dfd43c18189d768122117e9ff180e86e
+MISC ChangeLog 11491 RMD160 208439d58249b72744ce5305f9e712fab719c098 SHA1 52dc26189b0d1439c10b45d0fb8d539e83edd9b9 SHA256 777b5370e8a214c92fad4d683c0a40ca8eb9e61fd7f95fe940659a55d5a3614b
 MISC metadata.xml 599 RMD160 42954f89865c12c5fd4707bc784037f2231c6db6 SHA1 4ce649d4717b45387cdfd9b82984194deb8fcfad SHA256 ba34dcd7e24d8434345f6657e4c2d6b14b4e935590de308f23375e436c94556d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkx45XkACgkQI1lqEGTUzyR3MQCeOw0CQZwPA9KIF2UcMTkh3vMk
+Z/AAnjIpMmaSZJmjN4IxhBnaIeKBt7DC
+=KVhx
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.11-rename-pointer.patch b/x11-misc/x11vnc/files/x11vnc-0.9.11-rename-pointer.patch
new file mode 100644
index 000000000000..f17ad1c59aff
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.11-rename-pointer.patch
@@ -0,0 +1,273 @@
+From 8307143230b877b5e6ce1a667c977f7de6a465ce Mon Sep 17 00:00:00 2001
+From: Johannes Schindelin <johannes.schindelin@gmx.de>
+Date: Thu, 12 Aug 2010 14:27:41 +0200
+Subject: [PATCH 1/1] Rename pointer() to do_pointer() to fix bug 3043646
+
+[contains compile fixes by fk hp]
+
+Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
+---
+ x11vnc/connections.c |    2 +-
+ x11vnc/keyboard.c    |    4 ++--
+ x11vnc/pointer.c     |   24 ++++++++++++------------
+ x11vnc/pointer.h     |    2 +-
+ x11vnc/remote.c      |    6 +++---
+ x11vnc/scan.c        |    4 ++--
+ x11vnc/screen.c      |    2 +-
+ x11vnc/userinput.c   |    8 ++++----
+ 8 files changed, 26 insertions(+), 26 deletions(-)
+
+diff --git a/x11vnc/connections.c b/x11vnc/connections.c
+index d1af60e..5dd80ba 100644
+--- a/x11vnc/connections.c
++++ b/x11vnc/connections.c
+@@ -3149,7 +3149,7 @@ static void pmove(int x, int y) {
+ 		return;
+ 	}
+ 	rfbLog("pmove: x y: %d %d\n", x, y);
+-	pointer(0, x, y, NULL);
++	do_pointer(0, x, y, NULL);
+ 	X_LOCK;
+ 	XFlush_wr(dpy);
+ 	X_UNLOCK;
+diff --git a/x11vnc/keyboard.c b/x11vnc/keyboard.c
+index edce680..212c8e8 100644
+--- a/x11vnc/keyboard.c
++++ b/x11vnc/keyboard.c
+@@ -2898,9 +2898,9 @@ static void pipe_keyboard(rfbBool down, rfbKeySym keysym, rfbClientPtr client) {
+ 			t[1] = '\0';
+ 			if (sscanf(t, "%d", &butt) == 1) {
+ 				mask = 1<<(butt-1);
+-				pointer(mask, x, y, client);
++				do_pointer(mask, x, y, client);
+ 				mask = 0;
+-				pointer(mask, x, y, client);
++				do_pointer(mask, x, y, client);
+ 			}
+ 			b++;
+ 		}
+diff --git a/x11vnc/pointer.c b/x11vnc/pointer.c
+index 097a43c..0c42dc8 100644
+--- a/x11vnc/pointer.c
++++ b/x11vnc/pointer.c
+@@ -54,7 +54,7 @@ int pointer_queued_sent = 0;
+ 
+ void initialize_pointer_map(char *pointer_remap);
+ void do_button_mask_change(int mask, int button);
+-void pointer(int mask, int x, int y, rfbClientPtr client);
++void do_pointer(int mask, int x, int y, rfbClientPtr client);
+ void initialize_pipeinput(void);
+ int check_pipeinput(void);
+ void update_x11_pointer_position(int x, int y);
+@@ -417,7 +417,7 @@ void do_button_mask_change(int mask, int button) {
+ 				continue;
+ 			}
+ 			if (debug_pointer) {
+-				rfbLog("pointer(): sending button %d"
++				rfbLog("do_pointer(): sending button %d"
+ 				    " %s (event %d)\n", mb, bmask
+ 				    ? "down" : "up", k+1);
+ 			}
+@@ -436,7 +436,7 @@ void do_button_mask_change(int mask, int button) {
+ 			if (debug_pointer && dpy) {
+ 				char *str = XKeysymToString(XKeycodeToKeysym(
+                                     dpy, key, 0));
+-				rfbLog("pointer(): sending button %d "
++				rfbLog("do_pointer(): sending button %d "
+ 				    "down as keycode 0x%x (event %d)\n",
+ 				    i+1, key, k+1);
+ 				rfbLog("           down=%d up=%d keysym: "
+@@ -569,7 +569,7 @@ if (debug_scroll > 1) fprintf(stderr, "internal scrollbar: %dx%d\n", w, h);
+ 	for (i=0; i < MAX_BUTTONS; i++) {
+ 	    if ( (button_mask & (1<<i)) != (mask & (1<<i)) ) {
+ 		if (debug_pointer) {
+-			rfbLog("pointer(): mask change: mask: 0x%x -> "
++			rfbLog("do_pointer(): mask change: mask: 0x%x -> "
+ 			    "0x%x button: %d\n", button_mask, mask,i+1);
+ 		}
+ 		do_button_mask_change(mask, i+1);	/* button # is i+1 */
+@@ -668,7 +668,7 @@ static void pipe_pointer(int mask, int x, int y, rfbClientPtr client) {
+  * This may queue pointer events rather than sending them immediately
+  * to the X server. (see update_x11_pointer*())
+  */
+-void pointer(int mask, int x, int y, rfbClientPtr client) {
++void do_pointer(int mask, int x, int y, rfbClientPtr client) {
+ 	allowed_input_t input;
+ 	int sent = 0, buffer_it = 0;
+ 	double now;
+@@ -698,7 +698,7 @@ void pointer(int mask, int x, int y, rfbClientPtr client) {
+ 		dt = tnow - last_pointer;
+ 		last_pointer = tnow;
+ 		if (show_motion) {
+-			rfbLog("# pointer(mask: 0x%x, x:%4d, y:%4d) "
++			rfbLog("# do_pointer(mask: 0x%x, x:%4d, y:%4d) "
+ 			    "dx: %3d dy: %3d dt: %.4f t: %.4f\n", mask, x, y,
+ 			    x - last_x, y - last_y, dt, tnow);
+ 		}
+@@ -789,7 +789,7 @@ void pointer(int mask, int x, int y, rfbClientPtr client) {
+ 			}
+ 			if (! ok) {
+ 				if (debug_pointer) {
+-				    rfbLog("pointer(): blackout_ptr skipping "
++				    rfbLog("do_pointer(): blackout_ptr skipping "
+ 					"x=%d y=%d in rectangle %d,%d %d,%d\n", x, y,
+ 					blackr[b].x1, blackr[b].y1,
+ 					blackr[b].x2, blackr[b].y2);
+@@ -860,7 +860,7 @@ void pointer(int mask, int x, int y, rfbClientPtr client) {
+ 					ev[i][2] = -1;
+ 				}
+ 				if (debug_pointer) {
+-					rfbLog("pointer(): deferring event %d"
++					rfbLog("do_pointer(): deferring event %d"
+ 					    " %.4f\n", i, tmr - x11vnc_start);
+ 				}
+ 				POINTER_UNLOCK;
+@@ -883,7 +883,7 @@ void pointer(int mask, int x, int y, rfbClientPtr client) {
+ 				}
+ 			}
+ 			if (debug_pointer) {
+-				rfbLog("pointer(): sending event %d %.4f\n",
++				rfbLog("do_pointer(): sending event %d %.4f\n",
+ 				    i+1, dnowx());
+ 			}
+ 			if (ev[i][1] >= 0) {
+@@ -903,7 +903,7 @@ void pointer(int mask, int x, int y, rfbClientPtr client) {
+ 		    if (dpy) {	/* raw_fb hack */
+ 			if (mask < 0) {
+ 				if (debug_pointer) {
+-					rfbLog("pointer(): calling XFlush "
++					rfbLog("do_pointer(): calling XFlush "
+ 					    "%.4f\n", dnowx());
+ 				}
+ 				X_LOCK;
+@@ -920,7 +920,7 @@ void pointer(int mask, int x, int y, rfbClientPtr client) {
+ 	}
+ 	if (mask < 0) {		/* -1 just means flush the event queue */
+ 		if (debug_pointer) {
+-			rfbLog("pointer(): flush only.  %.4f\n",
++			rfbLog("do_pointer(): flush only.  %.4f\n",
+ 			    dnowx());
+ 		}
+ 		INPUT_UNLOCK;
+@@ -953,7 +953,7 @@ void pointer(int mask, int x, int y, rfbClientPtr client) {
+ 		X_UNLOCK;
+ 	} else if (buffer_it) {
+ 		if (debug_pointer) {
+-			rfbLog("pointer(): calling XFlush+"
++			rfbLog("do_pointer(): calling XFlush+"
+ 			    "%.4f\n", dnowx());
+ 		}
+ 		X_LOCK;
+diff --git a/x11vnc/pointer.h b/x11vnc/pointer.h
+index 558f381..56f659c 100644
+--- a/x11vnc/pointer.h
++++ b/x11vnc/pointer.h
+@@ -39,7 +39,7 @@ extern int pointer_queued_sent;
+ 
+ extern void initialize_pointer_map(char *pointer_remap);
+ extern void do_button_mask_change(int mask, int button);
+-extern void pointer(int mask, int x, int y, rfbClientPtr client);
++extern void do_pointer(int mask, int x, int y, rfbClientPtr client);
+ extern int check_pipeinput(void);
+ extern void initialize_pipeinput(void);
+ extern void update_x11_pointer_position(int x, int y);
+diff --git a/x11vnc/remote.c b/x11vnc/remote.c
+index 6b2903b..dfa9aa4 100644
+--- a/x11vnc/remote.c
++++ b/x11vnc/remote.c
+@@ -4426,9 +4426,9 @@ char *process_remote_cmd(char *cmd, int stringonly) {
+ 		p += strlen("ptr:");
+ 		rfbLog("remote_cmd: insert pointer event: %s\n", p);
+ 		if (sscanf(p, "%d,%d,%d", &x, &y, &m) == 3) {
+-			pointer(m, x, y, NULL);
++			do_pointer(m, x, y, NULL);
+ 		} else if (sscanf(p, "%d,%d", &x, &y) == 2) {
+-			pointer(m, x, y, NULL);
++			do_pointer(m, x, y, NULL);
+ 		} else {
+ 			rfbLog("remote_cmd: bad ptr:x,y,mask\n");
+ 		}
+@@ -4593,7 +4593,7 @@ char *process_remote_cmd(char *cmd, int stringonly) {
+ 		} else if (strstr(res, "GRAB_FAIL") && try < max_tries) {
+ 			rfbLog("bcx_xattach: failed grab check for '%s': %s.  Retrying[%d]...\n", p, res, try);
+ 			free(res);
+-			pointer(0, dpy_x/2 + try, dpy_y/2 + try, NULL);
++			do_pointer(0, dpy_x/2 + try, dpy_y/2 + try, NULL);
+ #if !NO_X11
+ 			X_LOCK;
+ 			XFlush_wr(dpy);
+diff --git a/x11vnc/scan.c b/x11vnc/scan.c
+index 7ef931c..23121f7 100644
+--- a/x11vnc/scan.c
++++ b/x11vnc/scan.c
+@@ -3550,7 +3550,7 @@ int scan_for_updates(int count_only) {
+ 			fb_copy_in_progress = 0;
+ 			SCAN_FATAL(cs);
+ 			if (use_threads && pointer_mode != 1) {
+-				pointer(-1, 0, 0, NULL);
++				do_pointer(-1, 0, 0, NULL);
+ 			}
+ 			nap_check(tile_count);
+ 			return tile_count;
+@@ -3637,7 +3637,7 @@ if (tile_count) fprintf(stderr, "XX copytile: %.4f  tile_count: %d\n", dnow() -
+ 		 * tell the pointer handler it can process any queued
+ 		 * pointer events:
+ 		 */
+-		pointer(-1, 0, 0, NULL);
++		do_pointer(-1, 0, 0, NULL);
+ 	}
+ 
+ 	if (blackouts) {
+diff --git a/x11vnc/screen.c b/x11vnc/screen.c
+index c41774c..5988ace 100644
+--- a/x11vnc/screen.c
++++ b/x11vnc/screen.c
+@@ -3538,7 +3538,7 @@ void initialize_screen(int *argc, char **argv, XImage *fb) {
+ 	/* event callbacks: */
+ 	screen->newClientHook = new_client;
+ 	screen->kbdAddEvent = keyboard;
+-	screen->ptrAddEvent = pointer;
++	screen->ptrAddEvent = do_pointer;
+ 	screen->setXCutText = xcut_receive;
+ 	screen->setTranslateFunction = set_xlate_wrapper;
+ 
+diff --git a/x11vnc/userinput.c b/x11vnc/userinput.c
+index 8c83080..b4cb8fa 100644
+--- a/x11vnc/userinput.c
++++ b/x11vnc/userinput.c
+@@ -3008,12 +3008,12 @@ if (db) fprintf(stderr, "check_xrecord: BUTTON-UP-KEEP-GOING:  %.3f/%.3f %d/%d %
+ 	pointer_queued_sent = 0;
+ 	last_x = cursor_x;
+ 	last_y = cursor_y;
+-	pointer(-1, 0, 0, NULL);
++	do_pointer(-1, 0, 0, NULL);
+ 	pointer_flush_delay = 0.0;
+ 
+ 	if (xrecording && pointer_queued_sent && button_mask_save &&
+ 	    (last_x != cursor_x || last_y != cursor_y) ) {
+-if (db) fprintf(stderr, "  pointer() push yields events on: ret=%d\n", ret);
++if (db) fprintf(stderr, "  do_pointer() push yields events on: ret=%d\n", ret);
+ 		if (ret == 2) {
+ if (db) fprintf(stderr, "  we decide to send ret=3\n");
+ 			want_back_in = 1;
+@@ -4509,7 +4509,7 @@ if (db) fprintf(stderr, "INTERIOR\n");
+ 	}
+ 
+ 	/*
+-	 * pointer() should have snapped the stacking list for us, if
++	 * do_pointer() should have snapped the stacking list for us, if
+ 	 * not, do it now (if the XFakeButtonEvent has been flushed by
+ 	 * now the stacking order may be incorrect).
+ 	 */
+@@ -4565,7 +4565,7 @@ if (db) fprintf(stderr, "INTERIOR\n");
+ 	/* -threads support for check_wireframe() is rough... crash? */
+ 	if (use_threads) {
+ 		/* purge any stored up pointer events: */
+-		pointer(-1, 0, 0, NULL);
++		do_pointer(-1, 0, 0, NULL);
+ 	}
+ 
+ 	if (cursor_noshape_updates_clients(screen)) {
+-- 
+1.6.3
+
diff --git a/x11-misc/x11vnc/x11vnc-0.9.11.ebuild b/x11-misc/x11vnc/x11vnc-0.9.11.ebuild
new file mode 100644
index 000000000000..5a649a50f6e0
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.11.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.11.ebuild,v 1.1 2010/08/28 10:31:14 swegener Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="A VNC server for real X displays"
+HOMEPAGE="http://www.karlrunge.com/x11vnc/"
+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"
+
+RDEPEND="system-libvncserver? ( >=net-libs/libvncserver-0.9.7[threads=,jpeg=,zlib=] )
+	!system-libvncserver? (
+		zlib? ( sys-libs/zlib )
+		jpeg? ( media-libs/jpeg:0 )
+	)
+	ssl? ( dev-libs/openssl )
+	avahi? ( >=net-dns/avahi-0.6.4 )
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libX11
+	>=x11-libs/libXtst-1.1.0
+	x11-libs/libXdamage
+	x11-libs/libXext"
+
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/inputproto
+	x11-proto/trapproto
+	x11-proto/recordproto
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+pkg_setup() {
+	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
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-rename-pointer.patch
+}
+
+src_configure() {
+	econf \
+		$(use_with system-libvncserver) \
+		$(use_with avahi) \
+		$(use_with xinerama) \
+		$(use_with ssl) \
+		$(use_with ssl crypto) \
+		$(use_with crypt) \
+		$(use_with v4l) \
+		$(use_with jpeg) \
+		$(use_with zlib) \
+		$(use_with threads pthread) \
+		$(use_with fbcon fbdev)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc x11vnc/{ChangeLog,README}
+}