version bump for bug #214627, bug #161930 and bug #214550

Package-Manager: portage-2.1.4.4

3 files changed, 321 insertions, 5 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 419af74b7a51..35034bce9a8a 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.320 2008/03/27 11:36:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.321 2008/04/06 13:20:38 aballier Exp $
+
+*vlc-0.8.6f (06 Apr 2008)
+
+  06 Apr 2008; Alexis Ballier <aballier@gentoo.org> +vlc-0.8.6f.ebuild:
+  version bump for bug #214627, bug #161930 and bug #214550
 
   27 Mar 2008; Alexis Ballier <aballier@gentoo.org> vlc-0.8.6e-r1.ebuild:
   Bump patchset to backport a fix from upstream to fix bug #214809
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index dfb4ef8dfe69..597e10b5982f 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -2,18 +2,21 @@
 Hash: SHA1
 
 DIST vlc-0.8.6e.tar.bz2 11098938 RMD160 f09bae196a7b22cdc6013c5fc22dd6f82d60737a SHA1 6b981ddbe7f6b95cd566ee195b4445b5773c21bd SHA256 e80b5af8e78889a67698d086da33779ed78b64c1387237282432d303c1809c3b
+DIST vlc-0.8.6f.tar.bz2 11433698 RMD160 c52d0cb7e8ba36f9d0959b9d6e1e8b1b36b71b04 SHA1 9684bb7504636d3e3143734698c2bbac250f4a03 SHA256 23efbf3777f1f719034f2f0a5ab67d69acd9d5a49f0014afea7b0a8b74effe14
 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
 DIST vlc-patches-48.tar.bz2 5839 RMD160 1ef334b9b8fccaad37647a9bd8d0f5dcb8f725da SHA1 2a5d36e42c7b517e1e271e4e354c6ecd86c3398c SHA256 fcfcbf65ef821ffef6161e1ad45010ab0fd75837a12a328c99ba152d3732f825
 DIST vlc-patches-50.tar.bz2 11374 RMD160 96797cdda6e2bb02bbc4569b7055fb697cc17f03 SHA1 68f6989e6b41ec144bf506252796379ccee598c3 SHA256 f6f8b806df747db54b7d72b57e610d321b19f57d6d976388b0d01a200500015e
+DIST vlc-patches-51.tar.bz2 8867 RMD160 def58f3ac0872e6848089af3fb1c5ce6e3fc878e SHA1 425be66b0e02610366348fcdca782bd81e0032c0 SHA256 a1c89d2749fc340a93d96beaab6f2a979e0cc59ed2f8e9f93bbc87e0c713000a
 DIST vlc-snapshot-20080319.tar.bz2 13608730 RMD160 c95ecac419a83846f12b5248808c9e279c871aee SHA1 f2ef963a862421faf9c1be1b8aa9a6c791324f78 SHA256 d7450c6900e5c0b874bc2a116b857ba81b8736193c6af21a8700862f3f105e25
 EBUILD vlc-0.8.6e-r1.ebuild 8868 RMD160 02dae24383c1e7ca6a48946ea61428c0eb4cc621 SHA1 a3887ade7a349a26b08ac45811d8608ec105552b SHA256 e35ffe5936ee00c39351f830df551257c9b040b0f3adf6d5981538b817ba6018
+EBUILD vlc-0.8.6f.ebuild 9104 RMD160 e26c74f56d4278f3b1f487b3ea202ccacbd69a80 SHA1 76c3ffcd065ccbfddd1708b0654ef92bc4d98ac2 SHA256 9d42de008fe2a55d90371b2c1efe2f031b31f8b74aadce4cc623e0bcc7d5aab1
 EBUILD vlc-0.9.0_alpha20080319.ebuild 10410 RMD160 f250aacec07fc6098bd9b68ad9c7d2700f8bb16b SHA1 b081e6e1a0d9f42b145c51799d91729b8b28c090 SHA256 507cf4e4c481b34f9c37a0861f2205ffac5fb767aba68e238fc28a2db2449570
-MISC ChangeLog 54245 RMD160 4a84a84b3a57b03d68709d58048888e1caf67937 SHA1 48ec26ce40d39c150559ff12fbb62a233540ff0f SHA256 8140f24be38016a8d07f591ddb8b59ea3dabeab690ed3d21af0688dceea40c23
+MISC ChangeLog 54405 RMD160 e08f2e3879d16e91e5b3052f4948c492f0886ac9 SHA1 ba469496c7d3b8c9f45a59785bac3231e1ccea73 SHA256 2c8c1a1aa72d3665505449992567294a2eff88c6c59da43289bb33cc9d40f42c
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkfrhsgACgkQvFcC4BYPU0rH9ACdHekN8A8cLPbqNDh6GfbOEnHk
-AawAoIjVH9bdPrVasUEKZjDAEuPUqVev
-=7Vzf
+iEYEARECAAYFAkf4zi4ACgkQvFcC4BYPU0rMcACgzntC/0NTj9gt8D6EYB1X4IbE
+tGEAnidgRQWkzhjGAI2MsnoJyOQxbML2
+=30h4
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-0.8.6f.ebuild b/media-video/vlc/vlc-0.8.6f.ebuild
new file mode 100644
index 000000000000..29f1dd3cf0d9
--- /dev/null
+++ b/media-video/vlc/vlc-0.8.6f.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6f.ebuild,v 1.1 2008/04/06 13:20:38 aballier Exp $
+
+WANT_AUTOMAKE=latest
+WANT_AUTOCONF=latest
+
+inherit eutils wxwidgets multilib autotools toolchain-funcs gnome2 nsplugins
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+
+PATCHLEVEL="51"
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
+
+if [[ "${P}" == *_p* ]]; then # Snapshots
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	MY_P="${P}"
+elif [[ "${MY_P}" == "${P}" ]]; then
+	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
+else
+	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2"
+fi
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="a52 3dfx debug altivec httpd vlm gnutls live v4l cdda ogg matroska
+dvb dvd vcd dts flac mpeg vorbis theora X opengl truetype svg fbcon svga
+oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc stream
+mp3 xv bidi sdl sdl-image png xml samba daap corba modplug speex shout rtsp
+win32codecs skins hal avahi xinerama cddb directfb upnp nsplugin seamonkey
+optimisememory libnotify jack musepack x264 dc1394 gnome xulrunner"
+
+RDEPEND="
+		>=media-video/ffmpeg-0.4.9_p20050226-r1
+		<media-video/ffmpeg-0.4.9_p20070616-r1
+		cdda? ( >=dev-libs/libcdio-0.71
+			cddb? ( >=media-libs/libcddb-1.2.0 ) )
+		live? ( >=media-plugins/live-2005.01.29 )
+		dvd? (	media-libs/libdvdread
+				media-libs/libdvdcss
+				>=media-libs/libdvdnav-0.1.9
+				media-libs/libdvdplay )
+		esd? ( media-sound/esound )
+		gnome? ( gnome-base/gnome-vfs )
+		ogg? ( media-libs/libogg )
+		matroska? (
+			>=dev-libs/libebml-0.7.6
+			>=media-libs/libmatroska-0.8.0 )
+		mp3? ( media-libs/libmad )
+		a52? ( >=media-libs/a52dec-0.7.4-r3 )
+		dts? ( media-libs/libdca )
+		flac? ( media-libs/libogg
+			>=media-libs/flac-1.1.2 )
+		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
+		vorbis? ( media-libs/libvorbis )
+		theora? ( media-libs/libtheora )
+		truetype? ( media-libs/freetype
+			media-fonts/ttf-bitstream-vera )
+		svga? ( media-libs/svgalib )
+		ggi? ( media-libs/libggi )
+		aalib? ( media-libs/aalib )
+		libcaca? ( media-libs/libcaca )
+		arts? ( kde-base/arts )
+		alsa? ( media-libs/alsa-lib )
+		wxwindows? ( =x11-libs/wxGTK-2.6* )
+		skins? ( =x11-libs/wxGTK-2.6*
+			media-libs/freetype
+			media-fonts/ttf-bitstream-vera )
+		ncurses? ( sys-libs/ncurses )
+		xosd? ( x11-libs/xosd )
+		lirc? ( app-misc/lirc )
+		3dfx? ( media-libs/glide-v3 )
+		bidi? ( >=dev-libs/fribidi-0.10.4 )
+		gnutls? ( >=net-libs/gnutls-1.2.9 )
+		sys-libs/zlib
+		png? ( media-libs/libpng )
+		media-libs/libdvbpsi
+		sdl? ( >=media-libs/libsdl-1.2.8
+			sdl-image? ( media-libs/sdl-image ) )
+		xml? ( dev-libs/libxml2 )
+		samba? ( net-fs/samba )
+		vcd? ( >=dev-libs/libcdio-0.72
+			>=media-video/vcdimager-0.7.21 )
+		daap? ( >=media-libs/libopendaap-0.3.0 )
+		corba? ( >=gnome-base/orbit-2.8.0
+			>=dev-libs/glib-2.3.2 )
+		modplug? ( media-libs/libmodplug )
+		speex? ( media-libs/speex )
+		svg? ( >=gnome-base/librsvg-2.5.0 )
+		shout? ( media-libs/libshout )
+		win32codecs? ( media-libs/win32codecs )
+		hal? ( sys-apps/hal )
+		avahi? ( >=net-dns/avahi-0.6 )
+		X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			xv? ( x11-libs/libXv )
+			xinerama? ( x11-libs/libXinerama )
+			opengl? ( virtual/opengl )
+		)
+		directfb? ( dev-libs/DirectFB )
+		upnp? ( net-libs/libupnp )
+		nsplugin? (
+			xulrunner? ( =net-libs/xulrunner-1.8* )
+			!xulrunner? ( seamonkey? ( =www-client/seamonkey-1* ) )
+			!xulrunner? ( !seamonkey? ( =www-client/mozilla-firefox-2* ) )
+		)
+		libnotify? ( x11-libs/libnotify )
+		musepack? ( media-libs/libmpcdec )
+		x264? ( >=media-libs/x264-svn-20061014 )
+		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
+		dc1394? ( sys-libs/libraw1394
+			<media-libs/libdc1394-1.9.99 )"
+
+DEPEND="${RDEPEND}
+	v4l? ( sys-kernel/linux-headers )
+	dvb? ( sys-kernel/linux-headers )
+	X? ( xinerama? ( x11-proto/xineramaproto ) )
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use wxwindows || use skins; then
+		WX_GTK_VER="2.6"
+		need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
+	fi
+
+	if use skins && ! use truetype; then
+		ewarn "Trying to build with skins support but without truetype."
+		ewarn "Enabling truetype."
+	fi
+	if use skins && ! use wxwindows; then
+		ewarn "Trying to build with skins support but without wxwindows."
+		ewarn "Enabling wxwindows."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	has_version '>=dev-libs/libcdio-0.78' || \
+		export EPATCH_EXCLUDE="230_all_libcdio-0.78.2.patch"
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile () {
+	local XPIDL=""
+	local MOZILLA_CONFIG=""
+
+	use vlm && \
+		myconf="${myconf} --enable-vlm --enable-sout" || \
+		myconf="${myconf} --disable-vlm"
+
+	if use nsplugin; then
+		if use xulrunner; then
+			XPIDL=/usr/$(get_libdir)/xulrunner
+			MOZILLA_CONFIG=/usr/bin/xulrunner-config
+		elif use seamonkey; then
+			XPIDL=/usr/$(get_libdir)/seamonkey
+			MOZILLA_CONFIG=/usr/$(get_libdir)/seamonkey/seamonkey-config
+		else
+			XPIDL=/usr/$(get_libdir)/mozilla-firefox
+			MOZILLA_CONFIG=/usr/$(get_libdir)/mozilla-firefox/firefox-config
+		fi
+	fi
+
+	if use live && ! has_version '>=media-plugins/live-2006.12.08'; then
+		myconf="${myconf} --enable-live555 --with-live555-tree=/usr/$(get_libdir)/live"
+	else
+		myconf="${myconf} $(use_enable live live555)"
+	fi
+
+	if use truetype || use skins; then
+		myconf="${myconf} --enable-freetype"
+	else
+		myconf="${myconf} --disable-freetype"
+	fi
+
+	if use wxwindows || use skins; then
+		myconf="${myconf} --enable-wxwidgets"
+	else
+		myconf="${myconf} --disable-wxwidgets"
+	fi
+
+	econf \
+		$(use_enable altivec) \
+		$(use_enable stream sout) \
+		$(use_enable httpd) \
+		$(use_enable gnutls) \
+		$(use_enable v4l) \
+		$(use_enable cdda) $(use_enable cdda cddax)\
+		$(use_enable cddb libcddb) \
+		$(use_enable vcd) $(use_enable vcd vcdx) \
+		$(use_enable dvb) $(use_enable dvb pvr) \
+		$(use_enable ogg) \
+		$(use_enable matroska mkv) \
+		$(use_enable flac) \
+		$(use_enable vorbis) \
+		$(use_enable theora) \
+		$(use_enable X x11) \
+		$(use_enable xv xvideo) \
+		$(use_enable xinerama) \
+		$(use_enable opengl glx) $(use_enable opengl) \
+		$(use_enable bidi fribidi) \
+		$(use_enable dvd dvdread) $(use_enable dvd dvdplay) $(use_enable dvd dvdnav) \
+		$(use_enable fbcon fb) \
+		$(use_enable svga svgalib) \
+		$(use_enable 3dfx glide) \
+		$(use_enable aalib aa) \
+		$(use_enable libcaca caca) \
+		$(use_enable oss) \
+		$(use_enable esd) \
+		$(use_enable arts) \
+		$(use_enable alsa) \
+		$(use_enable ncurses) \
+		$(use_enable gnome gnomevfs) \
+		$(use_enable xosd) \
+		$(use_enable lirc) \
+		$(use_enable mp3 mad) \
+		$(use_enable a52) \
+		$(use_enable dts) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable ggi) \
+		$(use_enable 3dfx glide) \
+		$(use_enable sdl) \
+		$(use_enable sdl-image) \
+		$(use_enable png) \
+		$(use_enable xml libxml2) \
+		$(use_enable samba smb) \
+		$(use_enable daap) \
+		$(use_enable corba) \
+		$(use_enable modplug mod) \
+		$(use_enable speex) \
+		$(use_enable shout) \
+		$(use_enable rtsp) $(use_enable rtsp realrtsp) \
+		$(use_enable win32codecs loader) \
+		$(use_enable skins skins2) \
+		$(use_enable hal) \
+		$(use_enable avahi bonjour) \
+		$(use_enable upnp) \
+		$(use_enable optimisememory optimize-memory) \
+		$(use_enable libnotify notify) \
+		$(use_enable jack) \
+		$(use_enable musepack mpc) \
+		$(use_enable x264) \
+		$(use_enable dc1394) \
+		$(use_enable directfb) \
+		--enable-ffmpeg \
+		--disable-faad \
+		--disable-dv \
+		--disable-libvc1 \
+		--disable-snapshot \
+		--disable-growl \
+		--disable-pth \
+		--disable-portaudio \
+		--disable-libtar \
+		--disable-optimizations \
+		--enable-utf8 \
+		--enable-libtool \
+		$(use_enable nsplugin mozilla) \
+		XPIDL="${XPIDL}" MOZILLA_CONFIG="${MOZILLA_CONFIG}" \
+		WX_CONFIG="${WX_CONFIG}" \
+		${myconf} || die "configuration failed"
+
+	if [[ $(gcc-major-version) == 2 ]]; then
+		sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
+	fi
+
+	emake || die "make of VLC failed"
+}
+
+src_install() {
+	# First install the library, to avoid screwups during relinking.select
+	emake -j1 DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS MAINTAINERS HACKING THANKS NEWS README \
+		doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
+
+	if use nsplugin; then
+		dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
+		mv "${D}"/usr/$(get_libdir)/mozilla/{components,plugins}/* \
+			"${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
+	fi
+
+	rm -rf "${D}/usr/share/doc/vlc" \
+		"${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
+
+	use skins || rm -rf "${D}/usr/share/vlc/skins2"
+
+	for res in 16 32 48; do
+		insinto /usr/share/icons/hicolor/${res}x${res}/apps/
+		newins "${S}"/share/vlc${res}x${res}.png vlc.png
+	done
+
+	use wxwindows || use skins || rm "${D}/usr/share/applications/vlc.desktop"
+}