Port the pointer() rename fix to older versions, bug #332425.

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

4 files changed, 25 insertions, 9 deletions

diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog
index e5bcea6d65eb..9aebc329ad19 100644
--- a/x11-misc/x11vnc/ChangeLog
+++ b/x11-misc/x11vnc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.88 2010/08/28 10:33:35 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.89 2010/08/28 10:38:02 swegener Exp $
+
+  28 Aug 2010; Sven Wegener <swegener@gentoo.org> x11vnc-0.9.9.ebuild,
+  x11vnc-0.9.10.ebuild:
+  Port the pointer() rename fix to older versions, bug #332425.
 
   28 Aug 2010; Sven Wegener <swegener@gentoo.org> -x11vnc-0.9.6.ebuild,
   -x11vnc-0.9.7.ebuild, -x11vnc-0.9.8.ebuild, -x11vnc-0.9.8-r1.ebuild,
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 11c466149249..80cf73025431 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -5,15 +5,15 @@ AUX x11vnc-0.9.11-rename-pointer.patch 9787 RMD160 4f029f172fe45b39d82aebdc50aaa
 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.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.10.ebuild 1942 RMD160 193d622befc4a0c1d99474d19e5c0e4c621c7551 SHA1 4e14e75d3f778478f78d5cc7962619db2282e802 SHA256 f32fd76623075c02ec6b54bd2c24868be77d1b0d8387356cf2245a12e788bebb
 EBUILD x11vnc-0.9.11.ebuild 1908 RMD160 80bb9af705fee2f8e3b49a248d1a2b350b2f48e0 SHA1 0c25af501f240fe633fa9eaa6fb5b48672e01a4c SHA256 027c137ccaab6b92b8b4ddb674d7ddb8cac61dfc78e7ddd55974614297a7e47c
-EBUILD x11vnc-0.9.9.ebuild 1840 RMD160 a197a7a739850f00997ce51491ba89de34d83b47 SHA1 b2f551132a18fafbc3f4254e31e63ab379070e12 SHA256 a061969e8ed0dfa2f4bb21f22faa87900e3f3633515b5a88e2e60e211cfdd806
-MISC ChangeLog 11691 RMD160 47209b5e53136dacb232bb3fab969d9c3361c9cc SHA1 19857bc4db306bf762c0714182260934c4b4b9ad SHA256 90a1bb58a107dbbd65a2a84db03fb582ba22f176c6829d3caf23d675b07f7fcb
+EBUILD x11vnc-0.9.9.ebuild 1932 RMD160 670e4da8da85d3d4d8ef5fd8d4e4d6108c54fb92 SHA1 7dd52bd9c8c0ad417deaabeb55300aadb3baf4ee SHA256 8520d921e535d8dd0ca5250903cc9a1656d49a03300a95efe9d1ccd8401862e2
+MISC ChangeLog 11851 RMD160 44614700ff19d66163fa969159b770f0c8043c50 SHA1 761c11f593dcf1a17e439203baaece142aa074b3 SHA256 44997ec791d7e95b04ddabae5d1c24b7a59530978226e85deaa78977d5931b36
 MISC metadata.xml 599 RMD160 42954f89865c12c5fd4707bc784037f2231c6db6 SHA1 4ce649d4717b45387cdfd9b82984194deb8fcfad SHA256 ba34dcd7e24d8434345f6657e4c2d6b14b4e935590de308f23375e436c94556d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkx45gQACgkQI1lqEGTUzyRDIACgoCm3LwsocMbH32//nEXYL3rr
-SmkAmgM7v/T66yPvPoaWe1+HxCAPIpfm
-=2OMe
+iEYEARECAAYFAkx45xAACgkQI1lqEGTUzyQOSwCgkupcuNIpxgNnqOwm7fIgnyfI
+64MAoMIpTGNhlQQw4TwXvme7cboURnow
+=Astq
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/x11vnc/x11vnc-0.9.10.ebuild b/x11-misc/x11vnc/x11vnc-0.9.10.ebuild
index 7a6319a7be46..c1138a840d47 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.10.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.10.ebuild
@@ -1,9 +1,11 @@
 # 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.10.ebuild,v 1.2 2010/06/24 20:14:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.10.ebuild,v 1.3 2010/08/28 10:38:02 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"
@@ -45,6 +47,10 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9.11-rename-pointer.patch
+}
+
 src_configure() {
 	econf \
 		$(use_with system-libvncserver) \
diff --git a/x11-misc/x11vnc/x11vnc-0.9.9.ebuild b/x11-misc/x11vnc/x11vnc-0.9.9.ebuild
index 7fe62cf16605..f839504705ad 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.9.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.9.ebuild
@@ -1,9 +1,11 @@
 # 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.9.ebuild,v 1.10 2010/08/02 19:03:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.9.ebuild,v 1.11 2010/08/28 10:38:02 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"
@@ -45,6 +47,10 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9.11-rename-pointer.patch
+}
+
 src_configure() {
 	econf \
 		$(use_with system-libvncserver) \