Print a warning when non-native avahi support has been enabled, bug #253218.

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

4 files changed, 30 insertions, 9 deletions

diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog
index 292f3b2875c8..4f68a70b0a9c 100644
--- a/x11-misc/x11vnc/ChangeLog
+++ b/x11-misc/x11vnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/x11vnc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.68 2009/04/17 18:49:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.69 2009/04/17 19:07:32 swegener Exp $
+
+  17 Apr 2009; Sven Wegener <swegener@gentoo.org> x11vnc-0.9.6,
+  x11vnc-0.9.7:
+  Print a warning when non-native avahi support has been enabled, bug
+  #253218.
 
 *x11vnc-0.9.7 (17 Apr 2009)
 
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 6301db6e76e8..cbc1317a28ad 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 DIST x11vnc-0.9.6.tar.gz 2461744 RMD160 5587d325fc9a3d735e653fefa2e4425c9e737477 SHA1 2cc67604a8a4bb0c40738f3bdf7295dee9637eb3 SHA256 35cf292b9f46142ddfb5ec5ae169d2ec33f2e4fa68cc7f49a0d98cac55727e1a
 DIST x11vnc-0.9.7.tar.gz 2528334 RMD160 e9eec21ca31b5ec215898624057edc6bd275edcb SHA1 0ce3a0dd83694fddd64d262320ab7d2edb5310cc SHA256 fd21224ec09ca5294ba0627433e4d2cb726d389c7818d162f152374e6d693342
-EBUILD x11vnc-0.9.6.ebuild 1664 RMD160 b2443f8429e39be355ee158ef3653636f76ec0aa SHA1 1150c935fffec63fbba570ca3c1ce452e2972df3 SHA256 25b040aed0007c9c704d18bb3a2789b07c6aae23740f0835b1639b7998bbf9f8
-EBUILD x11vnc-0.9.7.ebuild 1660 RMD160 1d614bb1e9c893c25bacd273e908109ea3d6b262 SHA1 53af9070fbd484cdf70e7159b180d88954b3c32b SHA256 523389f81dcff9aee14944f13a5d663a5872d1b5aae3c06c87d9d040c38a2a3f
-MISC ChangeLog 8783 RMD160 3c8b33d2a13129236adeba13385c258afa0c4f1c SHA1 5643e8072ff7f56d147811638601b38be6fcdf99 SHA256 bb6f9eda117230668b875ebe342d69bf0cfa7c37e18af4b4342ca163aebf1986
+EBUILD x11vnc-0.9.6.ebuild 1891 RMD160 75b485fe2abc83411e0b8c82fc7d15527fc33e06 SHA1 65c18dd03e67bf00c3fbf297d8cdc3a72d1dc63a SHA256 2046cb2e7c58ce913e3e7397ed5aa165a0b67b0162a065d84cb4a39dbd6d6f29
+EBUILD x11vnc-0.9.7.ebuild 1885 RMD160 883869bd1b71b43d8b743aba124acc38180104b3 SHA1 712e0ba9c64b11ebe9253bde7d25f0bd6510f3c5 SHA256 a027603cfd5b0a00b61e600132f5dc549aef9ce1865660b7a720338543382217
+MISC ChangeLog 8945 RMD160 55516ac52a94a64fe79bee516e3740535f707339 SHA1 194e579ddcf0b7dcb41aa6e6dfd857dbe8b33877 SHA256 a899a9fa8a6ef9fe0cd165fb3e24d1fa6e38384ab48f5d8ad32059c47b7ed7b2
 MISC metadata.xml 599 RMD160 42954f89865c12c5fd4707bc784037f2231c6db6 SHA1 4ce649d4717b45387cdfd9b82984194deb8fcfad SHA256 ba34dcd7e24d8434345f6657e4c2d6b14b4e935590de308f23375e436c94556d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknozzIACgkQI1lqEGTUzyQS9gCeKpHw50w4468vO6ijxyvh5JmM
-TSsAoIvs5362yD6DjKGkzkZbu8rrY/29
-=yeba
+iEYEARECAAYFAkno034ACgkQI1lqEGTUzyTJ+wCfWa9x6+L5/EBdElG0VG37q/4I
+U9IAn2iFOv3yDtzGrWRX7FvuFzlChxar
+=CE6h
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/x11vnc/x11vnc-0.9.6.ebuild b/x11-misc/x11vnc/x11vnc-0.9.6.ebuild
index 21f9f297337d..fc02930a1f05 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.6.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.6.ebuild,v 1.6 2009/03/02 16:06:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.6.ebuild,v 1.7 2009/04/17 19:07:32 swegener Exp $
 
 DESCRIPTION="A VNC server for real X displays"
 HOMEPAGE="http://www.karlrunge.com/x11vnc/"
@@ -33,6 +33,14 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto
 	x11-proto/xextproto"
 
+pkg_setup() {
+	if use avahi && ! use threads && ! use system-libvncserver
+	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_compile() {
 	local myconf=""
 
diff --git a/x11-misc/x11vnc/x11vnc-0.9.7.ebuild b/x11-misc/x11vnc/x11vnc-0.9.7.ebuild
index 6ee478cf846e..279fdce7413a 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.7.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.7.ebuild,v 1.1 2009/04/17 18:49:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.7.ebuild,v 1.2 2009/04/17 19:07:32 swegener Exp $
 
 EAPI="2"
 
@@ -35,6 +35,14 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto
 	x11-proto/xextproto"
 
+pkg_setup() {
+	if use avahi && ! use threads && ! use system-libvncserver
+	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_configure() {
 	local myconf=""