Added patch from Giandomenico De Tullio for enabing avahi support on 0.6 version and later, now bonjour support can be enabled on avahi greater than 0.3. Install the (patched) desktop file from debian directory instead of creating a new one.

(Portage version: 2.0.53)

4 files changed, 17 insertions, 20 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 012785316ebd..083be1fee475 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.124 2005/12/01 23:58:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.125 2005/12/02 16:55:45 flameeyes Exp $
+
+  02 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.4-r1.ebuild:
+  Added patch from Giandomenico De Tullio for enabing avahi support on 0.6
+  version and later, now bonjour support can be enabled on avahi greater than
+  0.3. Install the (patched) desktop file from debian directory instead of
+  creating a new one.
 
   01 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.1-r1.ebuild:
   Changing dep for ffmpeg to any revision of 20050226 snapshot to avoid dummy
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 66bb3871fb9b..ed541e19c6ac 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ff88c142fc5b0fe0c8a2d65d8af522bd ChangeLog 25003
 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
 MD5 d84791584b167d4cf96f365498050a62 files/digest-vlc-0.8.4 127
-MD5 e7f91e71a2b7c89a96d477ac21852415 files/digest-vlc-0.8.4-r1 127
+MD5 dfc692d917199e6f8984fa88a96f86ba files/digest-vlc-0.8.4-r1 128
 MD5 3f1662be15aab3fab1e7d11145f8f043 metadata.xml 249
 MD5 b55b715634893ca4626128bb6b2764f8 vlc-0.8.1-r1.ebuild 6024
 MD5 34c899e9870f05ff49336006f2a0ab92 vlc-0.8.2-r1.ebuild 7576
 MD5 06b1c25d0b8b20d67db5a61f4c8078f5 vlc-0.8.2-r2.ebuild 7458
-MD5 265366ae8cea8a25583309c9b89e420f vlc-0.8.4-r1.ebuild 7106
+MD5 3f58bcf6142c1e6ddea0cda7f3d1d19b vlc-0.8.4-r1.ebuild 7123
 MD5 c7260ce34328b0bb07e6c71813959374 vlc-0.8.4.ebuild 7045
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDj45ZAiZjviIA2XgRAioEAJ9kKA8jFCDBNTyettbM769DLGNdSQCg7J4i
-n0wdQM9LTNJ7jfd/RtBHMCg=
-=jFPZ
------END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/digest-vlc-0.8.4-r1 b/media-video/vlc/files/digest-vlc-0.8.4-r1
index c87033f4303a..4f646af4e77a 100644
--- a/media-video/vlc/files/digest-vlc-0.8.4-r1
+++ b/media-video/vlc/files/digest-vlc-0.8.4-r1
@@ -1,2 +1,2 @@
 MD5 5e94de5a374d2cab2a8d6f315204cc71 vlc-0.8.4.tar.bz2 7245500
-MD5 685ed261c1fb79bb5e838697ae9d6309 vlc-patches-9.tar.bz2 6921
+MD5 6d0ac65d5384f0a7e735d1668de10c8a vlc-patches-10.tar.bz2 8694
diff --git a/media-video/vlc/vlc-0.8.4-r1.ebuild b/media-video/vlc/vlc-0.8.4-r1.ebuild
index 8f273e29dd3c..968df503ec44 100644
--- a/media-video/vlc/vlc-0.8.4-r1.ebuild
+++ b/media-video/vlc/vlc-0.8.4-r1.ebuild
@@ -1,12 +1,12 @@
 # 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-r1.ebuild,v 1.2 2005/11/29 12:08:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4-r1.ebuild,v 1.3 2005/12/02 16:55:45 flameeyes Exp $
 
 inherit eutils wxwidgets flag-o-matic nsplugins multilib autotools toolchain-funcs
 
 MY_P="${P/_beta/-test}"
 
-PATCHLEVEL="9"
+PATCHLEVEL="10"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
 
@@ -25,7 +25,7 @@ IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdda ogg matr
 dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl freetype svg fbcon svga
 oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc joystick stream
 mp3 xv bidi sdl png xml2 samba daap corba screen mod speex nsplugin shout real
-win32codecs skins hal"
+win32codecs skins hal avahi"
 
 RDEPEND="cdda? ( >=dev-libs/libcdio-0.71
 			>=media-libs/libcddb-0.9.5 )
@@ -86,7 +86,8 @@ RDEPEND="cdda? ( >=dev-libs/libcdio-0.71
 		nsplugin? ( >=net-libs/gecko-sdk-1.7.8 )
 		shout? ( media-libs/libshout )
 		win32codecs? ( media-libs/win32codecs )
-		hal? ( sys-apps/hal )"
+		hal? ( sys-apps/hal )
+		avahi? ( >=net-dns/avahi-0.3 )"
 
 DEPEND="${RDEPEND}
 	=sys-devel/automake-1.6*
@@ -204,11 +205,11 @@ src_compile () {
 		$(use_enable win32codecs loader) \
 		$(use_enable skins skins2) \
 		$(use_enable hal) \
+		$(use_enable avahi bonjour) \
 		--disable-pth \
 		--disable-portaudio \
 		--disable-slp \
 		--disable-x264 \
-		--disable-bonjour \
 		${myconf} || die "configuration failed"
 
 	if [[ $(gcc-major-version) == 2 ]]; then
@@ -234,5 +235,5 @@ src_install() {
 		newins ${S}/share/vlc${res}x${res}.png vlc.png
 	done
 
-	make_desktop_entry vlc "VLC Media Player" vlc "AudioVideo;Player"
+	domenu "${S}/debian/vlc.desktop"
 }