Add a patch to use vncviewer instead of xvncviewer.

(Portage version: 2.1.3.19)

5 files changed, 28 insertions, 4 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 2edbb9a168b7..2dfd63134dc0 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.130 2007/11/10 09:45:36 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.131 2007/11/19 22:19:58 swegener Exp $
+
+  19 Nov 2007; Sven Wegener <swegener@gentoo.org>
+  +files/avahi-vncviewer.patch, avahi-0.6.19-r2.ebuild,
+  avahi-0.6.20-r2.ebuild, avahi-0.6.21.ebuild:
+  Add a patch to use vncviewer instead of xvncviewer.
 
   10 Nov 2007; Sven Wegener <swegener@gentoo.org> avahi-0.6.19-r2.ebuild,
   avahi-0.6.20-r2.ebuild, avahi-0.6.21.ebuild:
diff --git a/net-dns/avahi/avahi-0.6.19-r2.ebuild b/net-dns/avahi/avahi-0.6.19-r2.ebuild
index efd59691131b..569e215bcc54 100644
--- a/net-dns/avahi/avahi-0.6.19-r2.ebuild
+++ b/net-dns/avahi/avahi-0.6.19-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.19-r2.ebuild,v 1.4 2007/11/10 09:45:36 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.19-r2.ebuild,v 1.5 2007/11/19 22:19:58 swegener Exp $
 
 WANT_AUTOMAKE="1.9"
 
@@ -104,6 +104,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-assert-security.patch
 	epatch "${FILESDIR}"/${PN}-0.6.20-autoipd.patch
 	epatch "${FILESDIR}"/avahi-start-after-netmount.patch
+	epatch "${FILESDIR}"/avahi-vncviewer.patch
 
 	eautomake
 }
diff --git a/net-dns/avahi/avahi-0.6.20-r2.ebuild b/net-dns/avahi/avahi-0.6.20-r2.ebuild
index dd4d4aa1cc9a..faa8e0ec02d9 100644
--- a/net-dns/avahi/avahi-0.6.20-r2.ebuild
+++ b/net-dns/avahi/avahi-0.6.20-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2000-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.20-r2.ebuild,v 1.4 2007/11/10 09:45:36 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.20-r2.ebuild,v 1.5 2007/11/19 22:19:58 swegener Exp $
 
 WANT_AUTOMAKE="1.9"
 
@@ -104,6 +104,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-cleanup-dns-compression-table.patch
 	epatch "${FILESDIR}"/${P}-autoipd.patch
 	epatch "${FILESDIR}"/avahi-start-after-netmount.patch
+	epatch "${FILESDIR}"/avahi-vncviewer.patch
 
 	use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf
 
diff --git a/net-dns/avahi/avahi-0.6.21.ebuild b/net-dns/avahi/avahi-0.6.21.ebuild
index a137634195bb..016d0be785ea 100644
--- a/net-dns/avahi/avahi-0.6.21.ebuild
+++ b/net-dns/avahi/avahi-0.6.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2000-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild,v 1.8 2007/11/10 09:45:36 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild,v 1.9 2007/11/19 22:19:58 swegener Exp $
 
 inherit eutils mono python qt3 qt4
 
@@ -102,6 +102,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-service_name_chosen.patch
 	epatch "${FILESDIR}"/${P}-no-browse-domains-segfault.patch
 	epatch "${FILESDIR}"/avahi-start-after-netmount.patch
+	epatch "${FILESDIR}"/avahi-vncviewer.patch
 
 	use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf
 }
diff --git a/net-dns/avahi/files/avahi-vncviewer.patch b/net-dns/avahi/files/avahi-vncviewer.patch
new file mode 100644
index 000000000000..cad6eb210668
--- /dev/null
+++ b/net-dns/avahi/files/avahi-vncviewer.patch
@@ -0,0 +1,16 @@
+xvncviewer is an alternative on debian.
+vncviewer is what the vnc distribution and we use.
+
+--- avahi/avahi-ui/bssh.c
++++ avahi/avahi-ui/bssh.c
+@@ -76,8 +76,8 @@
+ 
+             gtk_widget_destroy(d);
+             
+-            g_print("xvncviewer %s\n", p);
+-            execlp("xvncviewer", "xvncviewer", p, NULL); 
++            g_print("vncviewer %s\n", p);
++            execlp("vncviewer", "vncviewer", p, NULL); 
+             
+         } else {
+             char p[16];