Remove bonjour support or vlc would fail if avahi 0.6 is installed. See bug #113665.

Package-Manager: portage-2.0.53_rc7

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index f87dc3d367122aa49dcbc38ca59f3dc414c04c50..eed5b07e0089655e761be6804241486883d19f82 100644 (file)
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.116 2005/11/24 17:36:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.117 2005/11/27 12:06:12 flameeyes Exp $
+
+  27 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.4_beta3.ebuild:
+  Remove bonjour support or vlc would fail if avahi 0.6 is installed. See bug
+  #113665.
 
   24 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.1-r1.ebuild,
   vlc-0.8.2-r1.ebuild, vlc-0.8.2-r2.ebuild, vlc-0.8.4_beta3.ebuild:

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 6b8774b13604ede67b91b9f4a23fb15371759663..6bb68b5dd48195e210acc2e2db0b006313771e21 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9ba39e8bcfd3bc195d748ecefcbb667a ChangeLog 23174
+MD5 1a58964e2e28acaadb32108708a9a5b9 ChangeLog 23341
 MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r1 127
 MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r1 127
 MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r2 127
@@ -10,11 +10,11 @@ MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 985ef1204c12d8382a06256f63dc4a4e vlc-0.8.1-r1.ebuild 6675
 MD5 34c899e9870f05ff49336006f2a0ab92 vlc-0.8.2-r1.ebuild 7576
 MD5 06b1c25d0b8b20d67db5a61f4c8078f5 vlc-0.8.2-r2.ebuild 7458
-MD5 01ebb521f226023c75b138599a5d84c9 vlc-0.8.4_beta3.ebuild 7729
+MD5 41fe8c14fb6cceb60dc7c97003ab447b vlc-0.8.4_beta3.ebuild 7751
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDhfocAiZjviIA2XgRAsYzAKCp8eKW9xrfJpOJ8c/s8m2V05FdKQCg3zCb
-Ns9OG5R4KxIWat4qhJAjqAQ=
-=s9WO
+iD8DBQFDiaFUAiZjviIA2XgRAsN1AJ9c89rgtC/eIJZUqVsKZFsq4e+0qgCg5hVk
+HPlR3TIK375uKHcqx2j/Unk=
+=Grji
 -----END PGP SIGNATURE-----

diff --git a/media-video/vlc/vlc-0.8.4_beta3.ebuild b/media-video/vlc/vlc-0.8.4_beta3.ebuild
index 859c37b01eee2a588939bd7bc81961f8b96d67d6..5887a246677dfc583c237b67d926628b14f2ba5f 100644 (file)
--- a/media-video/vlc/vlc-0.8.4_beta3.ebuild
+++ b/media-video/vlc/vlc-0.8.4_beta3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4_beta3.ebuild,v 1.2 2005/11/24 17:36:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4_beta3.ebuild,v 1.3 2005/11/27 12:06:12 flameeyes Exp $
 
 inherit libtool eutils wxwidgets flag-o-matic nsplugins multilib autotools toolchain-funcs
 
@@ -214,6 +214,7 @@ src_compile () {
                --disable-slp \
                --disable-hal \
                --disable-x264 \
+               --disable-bonjour \
                ${myconf} || die "configuration failed"
 
        if [[ $(gcc-major-version) == 2 ]]; then