Add a patch to use vncviewer instead of xvncviewer.

Package-Manager: portage-2.1.3.19

6 files changed, 51 insertions, 23 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/Manifest b/net-dns/avahi/Manifest
index c06900af2633..758e8461289e 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -61,25 +61,29 @@ AUX avahi-start-after-netmount.patch 998 RMD160 865a837ad85f6569405ab8d69bd08aeb
 MD5 3d9147891d07cf4418d27fff7edab1b7 files/avahi-start-after-netmount.patch 998
 RMD160 865a837ad85f6569405ab8d69bd08aebafbb9342 files/avahi-start-after-netmount.patch 998
 SHA256 03ec271640c86405297cdd2292bcb3745fac517ed050e777a3dfc4188f06b5fb files/avahi-start-after-netmount.patch 998
+AUX avahi-vncviewer.patch 474 RMD160 ca19092b5a410cefb67480f0de7f4baf8ceff1fc SHA1 1838114e7c0ed4ff15c4adaf791fb6cbfab1bb48 SHA256 3175b1febd682681a38536e1a8f65891b8d8467495b73ce40c4dcac0b2003d3b
+MD5 d5af9278583891238a674e1a5226425c files/avahi-vncviewer.patch 474
+RMD160 ca19092b5a410cefb67480f0de7f4baf8ceff1fc files/avahi-vncviewer.patch 474
+SHA256 3175b1febd682681a38536e1a8f65891b8d8467495b73ce40c4dcac0b2003d3b files/avahi-vncviewer.patch 474
 DIST avahi-0.6.19.tar.gz 973381 RMD160 15ae4baaa55f0020422552994a8d1ef33935b065 SHA1 367322064a5dd66a0e69c75df9407ab3518aebdc SHA256 a742dceda38f242f5eac72f2c3bc1bda76adf497d6913e88a9cbc624bf2dd68a
 DIST avahi-0.6.20.tar.gz 974209 RMD160 da413b25675184d1514953bfd308d544ca5f0556 SHA1 451a095440fba9bec2effa0730bb4ec29593d1b1 SHA256 89ae5fd08018679b80cee201e1c1350d86db73bdcf6718aabb4bd3ea86f93ec9
 DIST avahi-0.6.21.tar.gz 976841 RMD160 0f33afed44112a57c5353bf373a307c9c551abdb SHA1 3675f83b294b87a5cfa947d2f68518f0da8ed7b9 SHA256 d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561
-EBUILD avahi-0.6.19-r2.ebuild 4565 RMD160 3b2ee17c45f0a0b2b8fe80afa85efe6d5848d46e SHA1 fe4c1a5e10e496d6ad57709f12fc0eaf235c04cb SHA256 5d6e797dfd5d698977b3597cac90a46c6cc6925bf0ab8cd1905086f412f6154d
-MD5 d381433f63155f846f5f11157848814e avahi-0.6.19-r2.ebuild 4565
-RMD160 3b2ee17c45f0a0b2b8fe80afa85efe6d5848d46e avahi-0.6.19-r2.ebuild 4565
-SHA256 5d6e797dfd5d698977b3597cac90a46c6cc6925bf0ab8cd1905086f412f6154d avahi-0.6.19-r2.ebuild 4565
-EBUILD avahi-0.6.20-r2.ebuild 4675 RMD160 5f0178e2af39c8fa1178425578a994c7582e3d41 SHA1 1b6effe98295f45d845d6700bcece97bb5bed90a SHA256 663b38a521922161ce11024482edefb499335e7fc66ea5d90b19341aba12c0b8
-MD5 daeb8434c23234621f4eb9d1cd2f3422 avahi-0.6.20-r2.ebuild 4675
-RMD160 5f0178e2af39c8fa1178425578a994c7582e3d41 avahi-0.6.20-r2.ebuild 4675
-SHA256 663b38a521922161ce11024482edefb499335e7fc66ea5d90b19341aba12c0b8 avahi-0.6.20-r2.ebuild 4675
-EBUILD avahi-0.6.21.ebuild 4759 RMD160 4ae82639eb6c082628a03bf0700ca06fa93277ef SHA1 452ebd15edbd4be817107a5f0118405cd2e7fe91 SHA256 31d0cb8944546e57752aac4edb0347c29db41838d9c96a0a65f001fa7e88e543
-MD5 13ea8516a18bb70ed5386b978c8a852a avahi-0.6.21.ebuild 4759
-RMD160 4ae82639eb6c082628a03bf0700ca06fa93277ef avahi-0.6.21.ebuild 4759
-SHA256 31d0cb8944546e57752aac4edb0347c29db41838d9c96a0a65f001fa7e88e543 avahi-0.6.21.ebuild 4759
-MISC ChangeLog 18915 RMD160 dcc32cb49fdd157595407ff617b8909f53926f42 SHA1 e3bd2ae29fd718f1efac8428825b14b27d5ad643 SHA256 7567eb8695827ca55a07b173f5eec1ed596310d818d3b006e2074a17a666cae1
-MD5 50e9444d42fd2e86d537a79fed65edec ChangeLog 18915
-RMD160 dcc32cb49fdd157595407ff617b8909f53926f42 ChangeLog 18915
-SHA256 7567eb8695827ca55a07b173f5eec1ed596310d818d3b006e2074a17a666cae1 ChangeLog 18915
+EBUILD avahi-0.6.19-r2.ebuild 4609 RMD160 6f58bada613e9ea6077f275015d34208ca5e50a1 SHA1 69baaebf0453ca17f25748f8eb7cb0236c1d8116 SHA256 441070c2a462f3635ba3c5f10ab2e2d228b0daaa7896c21012e4ae73870206c8
+MD5 51fbd023132e5b1eb7155dfc3c230957 avahi-0.6.19-r2.ebuild 4609
+RMD160 6f58bada613e9ea6077f275015d34208ca5e50a1 avahi-0.6.19-r2.ebuild 4609
+SHA256 441070c2a462f3635ba3c5f10ab2e2d228b0daaa7896c21012e4ae73870206c8 avahi-0.6.19-r2.ebuild 4609
+EBUILD avahi-0.6.20-r2.ebuild 4719 RMD160 18a81eef7d7dd52091dbeb3409822603e2b496b2 SHA1 138885611df45b7691274924914ee2a1a4b7e98d SHA256 c88fd29bcd64f9520df6b7846ebd30f06213538cb59ce95df8b952bb622d4bda
+MD5 24115ffb74344b949e93f67f4b8baded avahi-0.6.20-r2.ebuild 4719
+RMD160 18a81eef7d7dd52091dbeb3409822603e2b496b2 avahi-0.6.20-r2.ebuild 4719
+SHA256 c88fd29bcd64f9520df6b7846ebd30f06213538cb59ce95df8b952bb622d4bda avahi-0.6.20-r2.ebuild 4719
+EBUILD avahi-0.6.21.ebuild 4803 RMD160 bc4d2f5956a5d18ddfbd83bb9b2b9be20d8d2fee SHA1 7a929dc1faeb7b123d5162f4fb0ae8899de561c2 SHA256 0fa9ec0586ed29bcfddcd4cf5c6ce7792399a3f386cc8b9132717a4c5b6b7578
+MD5 e297d2587e15564ecac5d39ad24815cc avahi-0.6.21.ebuild 4803
+RMD160 bc4d2f5956a5d18ddfbd83bb9b2b9be20d8d2fee avahi-0.6.21.ebuild 4803
+SHA256 0fa9ec0586ed29bcfddcd4cf5c6ce7792399a3f386cc8b9132717a4c5b6b7578 avahi-0.6.21.ebuild 4803
+MISC ChangeLog 19123 RMD160 760ca9504c4bd2c1d9c33492c9cce54cf2016cdc SHA1 2c986bcb188dcbaa2705efe08a0f638b9da0975a SHA256 c3d7aac235bd8435974d4d7a073954d13b25b7697f8dde305073bf8275e3cdff
+MD5 3e0315f8b3302d77acebdcaf835d499c ChangeLog 19123
+RMD160 760ca9504c4bd2c1d9c33492c9cce54cf2016cdc ChangeLog 19123
+SHA256 c3d7aac235bd8435974d4d7a073954d13b25b7697f8dde305073bf8275e3cdff ChangeLog 19123
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
 MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223
 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223
@@ -96,7 +100,7 @@ SHA256 959d8a48b6cc82ee56ba4c373c11569935ae21adb9ee13d0fe6bcbfb18669d35 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHNX3KI1lqEGTUzyQRAtfAAKDEl0YDDzPO5gyQJatrtDtFQjVVywCg1Oes
-RheuhQboyzerO4XVDmupm7I=
-=mWbM
+iD8DBQFHQgwYI1lqEGTUzyQRAgNBAJ9oQR5XCUluZWacJzHb6AOIk4zhzQCfXIai
+k5/vdXG7pCR/+otCmP71NAs=
+=YyaM
 -----END PGP SIGNATURE-----
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];