Revision bump. Depend on new system libvncserver supporting the threads USE flags. Fix missing xshm includes, bug #290827 by Wolfgang Draxinger and Fabiano.

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

4 files changed, 99 insertions, 6 deletions

diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog
index 91ce0f92bb8d..db3430e5856f 100644
--- a/x11-misc/x11vnc/ChangeLog
+++ b/x11-misc/x11vnc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/x11vnc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.70 2009/08/13 17:49:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.71 2009/11/06 21:54:33 swegener Exp $
+
+*x11vnc-0.9.8-r1 (06 Nov 2009)
+
+  06 Nov 2009; Sven Wegener <swegener@gentoo.org> +x11vnc-0.9.8-r1.ebuild,
+  +files/x11vnc-0.9.8-xshm-header-fix.patch:
+  Revision bump. Depend on new system libvncserver supporting the threads
+  USE flags. Fix missing xshm includes, bug #290827 by Wolfgang Draxinger
+  and Fabiano.
 
 *x11vnc-0.9.8 (13 Aug 2009)
 
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index ad42e03926e0..a716b398aa4f 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX x11vnc-0.9.8-xshm-header-fix.patch 258 RMD160 90ec02bb1989cab342908ddcab355f5bea9f176d SHA1 0845d140433216ebbc4831129f37f0c4d943dfee SHA256 cecdf8e4b4de758a238c8fbf1fd5f9155be6b9ae7ddb6151bdffa9a1568fce05
 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
 EBUILD x11vnc-0.9.6.ebuild 1891 RMD160 75b485fe2abc83411e0b8c82fc7d15527fc33e06 SHA1 65c18dd03e67bf00c3fbf297d8cdc3a72d1dc63a SHA256 2046cb2e7c58ce913e3e7397ed5aa165a0b67b0162a065d84cb4a39dbd6d6f29
 EBUILD x11vnc-0.9.7.ebuild 1885 RMD160 883869bd1b71b43d8b743aba124acc38180104b3 SHA1 712e0ba9c64b11ebe9253bde7d25f0bd6510f3c5 SHA256 a027603cfd5b0a00b61e600132f5dc549aef9ce1865660b7a720338543382217
+EBUILD x11vnc-0.9.8-r1.ebuild 1802 RMD160 0a0a42b9f1ff486e3f02b2d310774e4be1b9bffd SHA1 df3d9260bb64ee65cf93718dd18c8f3ec748a20b SHA256 d93f29831f8880151d435f6eb806341265fe701c5bd12ec7b832f1f8ac999b9f
 EBUILD x11vnc-0.9.8.ebuild 1885 RMD160 cabb1354b386988607f336ddb1b92a485ed4dd3f SHA1 c20e35a77a3838e53541726a713593f79fe64050 SHA256 a41b071ceec424f4cb599691b07bc8feab00c32e22aec18c9a50a162de2060b8
-MISC ChangeLog 9072 RMD160 7ccadbd2ad9ce4bdbdb785e8398a4c2c352c4f26 SHA1 918dcef15e12f3e67db95e327fd4fc614cad24b1 SHA256 e6c302d06e964e9b44f2865918f6448ecab135f40100ea69c9afb43989b5d365
+MISC ChangeLog 9388 RMD160 d608c17e02aed6c16969b5441879d0a77e434e41 SHA1 46f6f70178f3058717e832bb7acba9e545770c6c SHA256 89ed5d03d1911b150b4a9c7aaf8198e62161275b396f3c9607fbaa85a5d27fc7
 MISC metadata.xml 599 RMD160 42954f89865c12c5fd4707bc784037f2231c6db6 SHA1 4ce649d4717b45387cdfd9b82984194deb8fcfad SHA256 ba34dcd7e24d8434345f6657e4c2d6b14b4e935590de308f23375e436c94556d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkqEUkwACgkQI1lqEGTUzyQrhQCgkp7oTzkd7vpWdc9m6EQJVUtY
-724AnjyU+w6dJKkOx6weSxJ87Aoin7lE
-=bR0s
+iEYEARECAAYFAkr0mx4ACgkQI1lqEGTUzyStQgCghbUHNVwro6eTw5SnxfR3OesM
+LVwAmgN+zT0lMlBVWcHnVVpp/hk4G7DV
+=2Hfi
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.8-xshm-header-fix.patch b/x11-misc/x11vnc/files/x11vnc-0.9.8-xshm-header-fix.patch
new file mode 100644
index 000000000000..b25f2ed2baca
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.8-xshm-header-fix.patch
@@ -0,0 +1,13 @@
+--- x11vnc-0.9.8/x11vnc/x11vnc.h
++++ x11vnc-0.9.8/x11vnc/x11vnc.h
+@@ -76,6 +76,10 @@
+ #include <X11/keysym.h>
+ #include <X11/Xatom.h>
+ 
++#include <X11/Xmd.h>
++#include <X11/extensions/shm.h>
++#include <X11/extensions/shmproto.h>
++
+ #else
+ 
+ #define NO_X11 1
diff --git a/x11-misc/x11vnc/x11vnc-0.9.8-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.8-r1.ebuild
new file mode 100644
index 000000000000..69f330fb4cb5
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.8-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.8-r1.ebuild,v 1.1 2009/11/06 21:54:33 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"
+IUSE="+jpeg +zlib threads ssl crypt v4l xinerama avahi system-libvncserver"
+
+RDEPEND="system-libvncserver? ( >=net-libs/libvncserver-0.9.7[threads=] )
+	zlib? ( sys-libs/zlib )
+	jpeg? (	media-libs/jpeg )
+	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
+	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"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-xshm-header-fix.patch"
+}
+
+pkg_setup() {
+	if use avahi && ! use threads && ! use system-libvncserver
+	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_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) \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc x11vnc/{ChangeLog,README}
+}