Version bump (bug #384407).

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64

diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog
index a988c76a9a300475e1d47eb684e5e47cb928cf90..b960e057972f5f14a766cbbae1d561f2684099f2 100644 (file)
--- a/x11-misc/x11vnc/ChangeLog
+++ b/x11-misc/x11vnc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/x11vnc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.95 2011/11/01 03:56:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.96 2011/11/20 00:31:54 radhermit Exp $
+
+*x11vnc-0.9.13 (20 Nov 2011)
+
+  20 Nov 2011; Tim Harder <radhermit@gentoo.org> +x11vnc-0.9.13.ebuild,
+  +files/x11vnc-0.9.13-warnings.patch:
+  Version bump (bug #384407).
 
   01 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> x11vnc-0.9.9.ebuild,
   x11vnc-0.9.12.ebuild:

diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 47c2c75be336bb03955c16e4d72ff5e2b1dae2d5..759ec91768c10b1fa8880fd7436a7f29c22dc1ad 100644 (file)
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX x11vnc-0.9.11-rename-pointer.patch 9787 RMD160 4f029f172fe45b39d82aebdc50aaa49a797ffedc SHA1 139645d33fb7a926380a05e927ac390134c9a381 SHA256 061878de912b01c73dc597a5985b70cf95acdecfe679b0015f87f7e4d0f00f38
 AUX x11vnc-0.9.12-warnings.patch 2374 RMD160 affc1645f76ebbe696a40583111b710af9d7dc22 SHA1 45e2ea68cd51fc5225f832632a7cccbd65a73d63 SHA256 470901cfa68bb85f911959eb99c24f20e20872ea214a963251304f88ce054b43
+AUX x11vnc-0.9.13-warnings.patch 1363 RMD160 361bc6050653908ff36959944225cdcff0897570 SHA1 6e10ae2cc4f6d6e1e1b1aea16828d616a03a6165 SHA256 4db7b0b699e009362eaef6be222041cc333541273cf47db52dc71e521a0c4ffe
 DIST x11vnc-0.9.12.tar.gz 2757806 RMD160 4df835e53a6b3dccd47d49109a712c0405a798d7 SHA1 cf4e24bee5962b52d8f2a5442a7c44943a9cc0bb SHA256 60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79
+DIST x11vnc-0.9.13.tar.gz 2853769 RMD160 5819a4ae85b25b41fb747ccafd27e228c3ee888e SHA1 f011d81488ac94dc8dce2d88739c23bd85a976fa SHA256 f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b
 DIST x11vnc-0.9.9.tar.gz 2671958 RMD160 1b1335253c1f40f69ffbfdff5c4c5f28ed6315c3 SHA1 deb0c71cc0f7d6b99fb4b1484232aa935fe62c90 SHA256 6b960267b1f842efe5fb76b5d36fbee79ca8ea31528ee83877623e1cca0fbbe9
 EBUILD x11vnc-0.9.12.ebuild 2062 RMD160 124e7862088708aae6cf60cd5f522eb2c633b47f SHA1 f15bf97b07f2c331b21438712fc095c01a58c62e SHA256 1b942a8ef06bea142bb122038c895c1651cc2e3a05d8c89b9c0b766b7cc7184f
+EBUILD x11vnc-0.9.13.ebuild 2055 RMD160 fcf8eee6dcb1b48408481387c07131ce430459ab SHA1 da324c606f12b022852c0bba5dcdcb5c0e26e13e SHA256 9e3bd4c17a25385912536320a41e72f9fee6fd225999206a8a4b4b884782bfcd
 EBUILD x11vnc-0.9.9.ebuild 2020 RMD160 786d56c10f7544680c6c75ec952d99a68a0a94f5 SHA1 824a837682f6e9cdde1cccb420772cb88a2219c7 SHA256 7908dc27443cd9a3f9e70e8943975b9c8b1d1fa7ed37af1fa586ea42e2ea71dc
-MISC ChangeLog 12899 RMD160 650c455b02ffcc8b7954a547f205cbbc8a71422c SHA1 09c6ee63cbc1860b6ca1fc263984b75882718e6c SHA256 863f08bfc29e81cb260fb743cb7f81b948064970cf8b3cefcb5b8cdd61e98a1d
+MISC ChangeLog 13071 RMD160 652ebd3695933976c9e6a160dd8efd875dd0127a SHA1 0616000511ed8fd40261848db6003b20ee55d1b2 SHA256 89da2f69ad6ab0658d33c59a19755e103a1db86bee390c32b50d59a423d82995
 MISC metadata.xml 641 RMD160 0dcb7d17173c68432c151890ad6b01756102cfcf SHA1 c2d2ad814d6a69bb63d05042de2d143e99e50576 SHA256 cfa5030109f940dfb245882713ec5793a58166b3efccdb299f6318cbc810f4a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOr24EAAoJEEdUh39IaPFNSWYIAJzBduUWEfeKa1G8ROhRuZkc
-XjUJ1xWuTbZhc4uDVsV5eoqVChW1gy85WAFH7Bt25rpeTPRdWqc1G8/RrInfdRId
-d77HebdUWPMhXnCH5j+1MIAGFewoTDRq6VbNpvsA2yPZg9bPHrA0+yrOJCYHOlWh
-AHOg5Nxiv1gtgsyETDklG4KZksSkiVNKTjh1i8yPoFf19Cy6wr0H3ZGZt3A5grpG
-Mj9v7PVHiaYygrchredGAXXLNCXBV88jDMPGyP+KHlXZJRjSC9ZYyQ+SVHwBhX/r
-DQPyls0ez5YhIRz6rjoblW0B1cwMF/+65mO5HGM7ba/A108nM5/Exs3Vsim/l/8=
-=Yz4a
+iQEcBAEBCgAGBQJOyEqAAAoJEEqz6FtPBkyjU+kIAJ6DSzqEItBXUaUhfKSk3NAx
+zPg9gxNKMH8iFka7Wvg1saEgHES1njLprV6ywXxUWNHxzEwnRQS9tsgvihjwKSPN
+mS0oFYNusxKxYjod/t8fqXMle3yjcpStcrMPtejfyESPckuSIL+DZ8TQa+78XkQl
+P4D5VdHD/12wwDx3v2pFcH7Lff29vcuztWvgJ0Y+XkZqxmeMbXfaYnL9O3mt9amW
+iVCH94lpQf4+3fjkfjz6Rsak49kLuI9t9ribq3yh239tVb1KMUyB0L1x+AoVzl1o
++hANrniOtsS+Sw19MlIQoFHS7VzZCIXhUZY7d7YvZKqyUvDwkzbQJeuqx7dsxXU=
+=tmPG
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.13-warnings.patch b/x11-misc/x11vnc/files/x11vnc-0.9.13-warnings.patch
new file mode 100644 (file)
index 0000000..f80e83f
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.13-warnings.patch
@@ -0,0 +1,42 @@
+--- x11vnc-0.9.13.orig/x11vnc/remote.c
++++ x11vnc-0.9.13/x11vnc/remote.c
+@@ -5860,7 +5860,7 @@
+               }
+               if (!strcmp(p, "vncdisplay")) {
+                       snprintf(buf, bufn, "aro=%s:%s", p,
+-                          NONUL(vnc_desktop_name));
++                          vnc_desktop_name);
+                       goto qry;
+               }
+               if (!strcmp(p, "icon_mode")) {
+@@ -6062,7 +6062,7 @@
+               if (!strcmp(p, "h") || !strcmp(p, "help") ||
+                   !strcmp(p, "V") || !strcmp(p, "version") ||
+                   !strcmp(p, "lastmod")) {
+-                      snprintf(buf, bufn, "aro=%s:%s", p, NONUL(lastmod));
++                      snprintf(buf, bufn, "aro=%s:%s", p, lastmod);
+                       goto qry;
+               }
+               if (!strcmp(p, "bg")) {
+--- x11vnc-0.9.13.orig/x11vnc/sslhelper.c
++++ x11vnc-0.9.13/x11vnc/sslhelper.c
+@@ -4041,7 +4041,7 @@
+                               strncpy(last_get, rcookie, 100);
+                               if (db) fprintf(stderr, "last_get: '%s'\n", last_get);
+                       }
+-                      if (rcookie && strstr(rcookie, "VncViewer.class")) {
++                      if (strstr(rcookie, "VncViewer.class")) {
+                               rfbLog("\n");
+                               rfbLog("helper[%d]:\n", pid);
+                               rfbLog("***********************************************************\n");
+--- x11vnc-0.9.13.orig/x11vnc/userinput.c
++++ x11vnc-0.9.13/x11vnc/userinput.c
+@@ -1305,7 +1305,7 @@
+       int font_size = 15;
+       int win_y, scr_y, loc_cut = 4*font_size, y_cut = 10*font_size;
+       
+-      if (!xrecord_set_by_keys || !xrecord_name_info) {
++      if (!xrecord_set_by_keys) {
+               return 0;
+       }
+       if (xrecord_name_info[0] == '\0') {

diff --git a/x11-misc/x11vnc/x11vnc-0.9.13.ebuild b/x11-misc/x11vnc/x11vnc-0.9.13.ebuild
new file mode 100644 (file)
index 0000000..4f35434
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.13.ebuild
@@ -0,0 +1,74 @@
+# 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.13.ebuild,v 1.1 2011/11/20 00:31:54 radhermit Exp $
+
+EAPI="4"
+
+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="avahi crypt fbcon +jpeg ssl system-libvncserver threads tk xinerama +zlib"
+
+RDEPEND="system-libvncserver? ( >=net-libs/libvncserver-0.9.7[threads=,jpeg=,zlib=] )
+       !system-libvncserver? (
+               zlib? ( sys-libs/zlib )
+               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
+       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}-warnings.patch
+}
+
+src_configure() {
+       # --without-v4l because of missing video4linux 2.x support wrt #389079
+       econf \
+               $(use_with system-libvncserver) \
+               $(use_with avahi) \
+               $(use_with xinerama) \
+               $(use_with ssl) \
+               $(use_with ssl crypto) \
+               $(use_with crypt) \
+               --without-v4l \
+               $(use_with jpeg) \
+               $(use_with zlib) \
+               $(use_with threads pthread) \
+               $(use_with fbcon fbdev)
+}
+
+src_install() {
+       emake DESTDIR="${D}" install
+       dodoc x11vnc/{ChangeLog,README}
+       # Remove include files, which conflict with net-libs/libvncserver
+       rm -rf "${D}"/usr/include
+}