Little workaround for broken expectk binary, see bug #308713.

Package-Manager: portage-2.1.7.17/cvs/Linux i686

6 files changed, 72 insertions, 10 deletions

diff --git a/x11-misc/x2vnc/ChangeLog b/x11-misc/x2vnc/ChangeLog
index b1b9b88f70da..71b3a37771a9 100644
--- a/x11-misc/x2vnc/ChangeLog
+++ b/x11-misc/x2vnc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/x2vnc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2vnc/ChangeLog,v 1.34 2010/03/09 20:30:41 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2vnc/ChangeLog,v 1.35 2010/03/14 20:56:09 phosphan Exp $
+
+*x2vnc-1.7.2-r1 (14 Mar 2010)
+
+  14 Mar 2010; Patrick Kursawe <phosphan@gentoo.org> +x2vnc-1.7.2-r1.ebuild,
+  +files/expectk.patch:
+  Little workaround for broken expectk binary, see bug #308713.
 
   09 Mar 2010; Patrick Kursawe <phosphan@gentoo.org> -x2vnc-1.7.1.ebuild:
   Removing obsolete revision.
diff --git a/x11-misc/x2vnc/Manifest b/x11-misc/x2vnc/Manifest
index ccd0fa20ea73..a3ee31b8fffa 100644
--- a/x11-misc/x2vnc/Manifest
+++ b/x11-misc/x2vnc/Manifest
@@ -1,6 +1,8 @@
+AUX expectk.patch 394 RMD160 7eb3039615a1f3e01ef68411297da611e59fc9e9 SHA1 7fe55f9c258be5b7f3b2bd0b492320cc148c3f09 SHA256 a938075dab3b9195aec1a191cf1a54dc94b4c85f6f2eb759dc0415f75f6082a8
 DIST x2vnc-1.6.1.tar.gz 62297 RMD160 090d771318ddde725313c11f52ecb6eebb667221 SHA1 db0030bad0a066e4f1ea49087742c304a163c5e1 SHA256 2019f74ce10a3818f65b3196cad6bc18554892495d1a4b1047981d70c20f839d
 DIST x2vnc-1.7.2.tar.gz 82258 RMD160 a656365f2b09dd328594d092c1269fcc5c4841c6 SHA1 aa1ed718e04e6beb3e7db94325198fdf330d8d1e SHA256 dc076dc0dad1ae4ebf5bc95bf792812b2639e92e127efb9c68de6a53874c7001
-EBUILD x2vnc-1.6.1.ebuild 795 RMD160 a4f5d519c776262be05780e9919f3a579e36fa9b SHA1 f7a0c3b2e9b659b8a01e1785f70abea43e926ce5 SHA256 09903aef64d48a2cae11b3933ce7d19b38a819cb805ff934fc2a0fe1cf45300d
-EBUILD x2vnc-1.7.2.ebuild 799 RMD160 76a8e531c2abef4b29a3099b56cc49941b3097b6 SHA1 30198e224e4bbe2d29072f0f4f185a11e25353a4 SHA256 2e4ba8bf1b32159ccfdda162427f53141cd4b27694d27d2e74691f7a55342a40
-MISC ChangeLog 3976 RMD160 d8209d6f48b252e272c3ba1bf4d4af58a31b137f SHA1 15e5049897c797a41b97addfb4bf593c262bb2f7 SHA256 f273f47a8ca3c6751900021fdfacda58b7205a50744e6a45714f5481d1cab655
+EBUILD x2vnc-1.6.1.ebuild 797 RMD160 9574350f104cc39b3cf886991c2b87be39199f97 SHA1 37c3b0fcd675976045d504018a4b99d87c6491fe SHA256 a4b4588026dc6706f3744550c8b88a72c376dfedb193a26708fec3c3760eec4f
+EBUILD x2vnc-1.7.2-r1.ebuild 908 RMD160 dd03087b4920c3e130957ebfea024ecf8059890b SHA1 6f8ad749ee183ec617ab138a0be7cfd8a5b866d5 SHA256 e79fdf1e218ecb2255548223a01cf3f80af0f5952e180b8dd4822d2de9a2cc73
+EBUILD x2vnc-1.7.2.ebuild 800 RMD160 c7c59b3ef4db8a98541287a90354da9fecc6f559 SHA1 df987f65c30ff9f5c1fab962da9e23b4bb759aa2 SHA256 82d9331ebcfe83f0c1b769fba106b3afc9dc6c53805a1b9cfe0db600a085979b
+MISC ChangeLog 4173 RMD160 55ca071972b9220f3cd82d481b8fe991a74ac1c5 SHA1 9fdcab8799cb116cd35a07991b673dc73b16834c SHA256 7f611a454860d1755041b5ae1a40d334bff2f71fb86fd93fc519b15674321af2
 MISC metadata.xml 229 RMD160 47a0ab3f9561f670f64cbeba3a3c923b24161520 SHA1 5ddb48f84952e34b4b1181079dfd764d08f26378 SHA256 8653799042b178ad608e7e3b1591514a901fc074c691c4abe071f048e919e348
diff --git a/x11-misc/x2vnc/files/expectk.patch b/x11-misc/x2vnc/files/expectk.patch
new file mode 100644
index 000000000000..5c5ba6887cb1
--- /dev/null
+++ b/x11-misc/x2vnc/files/expectk.patch
@@ -0,0 +1,17 @@
+--- tkx2vnc	2010-03-14 21:31:49.000000000 +0100
++++ tkx2vnc.new	2010-03-14 21:32:58.000000000 +0100
+@@ -1,10 +1,13 @@
+-#!/usr/bin/expectk -f
++#!/usr/bin/wish
+ 
+ # Name: tkx2vnc
+ # Author: David Noble
+ # Version: 1.0a
+ # Written: May 13, 2002
+ # Modified: May 15, 2002
++# Expect dependency fixed by Patrick Kursawe, March 14, 2010
++
++package require Expect
+ 
+ proc prompt {} {
+     global prefs
diff --git a/x11-misc/x2vnc/x2vnc-1.6.1.ebuild b/x11-misc/x2vnc/x2vnc-1.6.1.ebuild
index e5e202da1bd6..703993b92cc9 100644
--- a/x11-misc/x2vnc/x2vnc-1.6.1.ebuild
+++ b/x11-misc/x2vnc/x2vnc-1.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2vnc/x2vnc-1.6.1.ebuild,v 1.9 2007/07/22 03:35:05 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2vnc/x2vnc-1.6.1.ebuild,v 1.10 2010/03/14 20:56:09 phosphan Exp $
 
 DESCRIPTION="Control a remote computer running VNC from X"
 HOMEPAGE="http://fredrik.hubbe.net/x2vnc.html"
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}
 
 src_install() {
 	dodir /usr/share /usr/bin
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	use tk && dobin contrib/tkx2vnc
 	dodoc ChangeLog README
 }
diff --git a/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild b/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
new file mode 100644
index 000000000000..2a9b5cf5fc5c
--- /dev/null
+++ b/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild,v 1.1 2010/03/14 20:56:09 phosphan Exp $
+
+inherit eutils
+
+DESCRIPTION="Control a remote computer running VNC from X"
+HOMEPAGE="http://fredrik.hubbe.net/x2vnc.html"
+SRC_URI="http://fredrik.hubbe.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="tk"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXext
+	x11-libs/libXinerama"
+DEPEND="${RDEPEND}
+	x11-proto/scrnsaverproto
+	x11-proto/xproto
+	x11-proto/xineramaproto
+	tk? ( dev-tcltk/expect )"
+
+src_unpack() {
+		unpack ${A}
+		cd "${S}/contrib"
+		epatch "${FILESDIR}/expectk.patch"
+}
+
+src_install() {
+	dodir /usr/share /usr/bin
+	make DESTDIR="${D}" install || die
+	use tk && dobin contrib/tkx2vnc
+	dodoc ChangeLog README
+}
diff --git a/x11-misc/x2vnc/x2vnc-1.7.2.ebuild b/x11-misc/x2vnc/x2vnc-1.7.2.ebuild
index b18e52f52dd5..e88a2835c0fb 100644
--- a/x11-misc/x2vnc/x2vnc-1.7.2.ebuild
+++ b/x11-misc/x2vnc/x2vnc-1.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2vnc/x2vnc-1.7.2.ebuild,v 1.3 2007/07/22 03:35:05 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2vnc/x2vnc-1.7.2.ebuild,v 1.4 2010/03/14 20:56:09 phosphan Exp $
 
 DESCRIPTION="Control a remote computer running VNC from X"
 HOMEPAGE="http://fredrik.hubbe.net/x2vnc.html"
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}
 
 src_install() {
 	dodir /usr/share /usr/bin
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	use tk && dobin contrib/tkx2vnc
 	dodoc ChangeLog README
 }