bump to pre3

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 14 insertions, 7 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index b59c6275688f..f553fb9190d0 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.765 2011/12/27 17:17:29 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.766 2011/12/31 11:37:24 aballier Exp $
+
+*vlc-1.2.0_pre3 (31 Dec 2011)
+
+  31 Dec 2011; Alexis Ballier <aballier@gentoo.org> -vlc-1.2.0_pre1.ebuild,
+  +vlc-1.2.0_pre3.ebuild:
+  bump to pre3
 
   27 Dec 2011; Mark Loeser <halcy0n@gentoo.org> vlc-1.1.13.ebuild:
   Stable for ppc/ppc64; bug #395543
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 13a9a6b0c721..12eb76ce3f0c 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -44,7 +44,6 @@
 	<flag name="macosx-dialog-provider">Enables Mac OS X dialog module.</flag>
 	<flag name="macosx-eyetv">Enables Mac OS X EyeTV (TNT Tuner) module.</flag>
 	<flag name="macosx-quartztext">Enables Mac OS X quartz text module.</flag>
-	<flag name="macosx-qtcapture">Enables Mac OS X qtcapture (iSight) module.</flag>
 	<flag name="macosx-qtkit">Enables Mac OS X qtkit module: qtcapture (video) and qtsound (audio) module.</flag>
 	<flag name="macosx-vout">Enables Mac OS X video output module.</flag>
 	<flag name="matroska">Enables matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)</flag>
diff --git a/media-video/vlc/vlc-1.2.0_pre1.ebuild b/media-video/vlc/vlc-1.2.0_pre3.ebuild
index cc196f92f840..8e49cd6321ab 100644
--- a/media-video/vlc/vlc-1.2.0_pre1.ebuild
+++ b/media-video/vlc/vlc-1.2.0_pre3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.2.0_pre1.ebuild,v 1.2 2011/12/06 12:29:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.2.0_pre3.ebuild,v 1.1 2011/12/31 11:37:24 aballier Exp $
 
 EAPI="4"
 
@@ -50,7 +50,7 @@ IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
 	growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
 	libproxy libsamplerate libtiger libv4l2 linsys libtar lirc live lua +macosx
 	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
-	+macosx-qtcapture +macosx-vout matroska media-library mmx modplug mp3 mpeg
+	+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
 	mtp musepack ncurses neon ogg omxil opengl optimisememory oss png portaudio
 	+postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba schroedinger
 	sdl sdl-image shine shout sid skins speex sqlite sse svg +swscale switcher
@@ -67,7 +67,7 @@ RDEPEND="
 		avcodec? ( virtual/ffmpeg )
 		avformat? ( virtual/ffmpeg )
 		bidi? ( >=dev-libs/fribidi-0.10.4 )
-		bluray? ( media-libs/libbluray >=dev-libs/libxml2-2.6:2 )
+		bluray? ( >=media-libs/libbluray-0.2.1 )
 		cddb? ( >=media-libs/libcddb-1.2.0 )
 		dbus? ( >=sys-apps/dbus-1.0.2 )
 		dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
@@ -98,7 +98,7 @@ RDEPEND="
 		libtiger? ( media-libs/libtiger )
 		linsys? ( >=media-libs/zvbi-0.2.28 )
 		lirc? ( app-misc/lirc )
-		live? ( >=media-plugins/live-2010.10.15 )
+		live? ( >=media-plugins/live-2011.12.02 )
 		lua? ( >=dev-lang/lua-5.1 )
 		macosx-vout? ( virtual/opengl )
 		matroska? (	>=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 )
@@ -173,6 +173,7 @@ REQUIRED_USE="
 	switcher? ( avcodec )
 	vaapi? ( avcodec X )
 	vlm? ( encode )
+	xosd? ( X )
 	xv? ( xcb )
 "
 
@@ -258,7 +259,7 @@ src_configure() {
 		$(use_enable macosx-audio) \
 		$(use_enable macosx-dialog-provider) \
 		$(use_enable macosx-eyetv) \
-		$(use_enable macosx-qtcapture) \
+		$(use_enable macosx-qtkit) \
 		$(use_enable macosx-quartztext) \
 		$(use_enable macosx-vout) \
 		$(use_enable matroska mkv) \
@@ -321,6 +322,7 @@ src_configure() {
 		$(use_enable xv xvideo) \
 		$(use_enable zvbi) $(use_enable !zvbi telx) \
 		--disable-optimizations \
+		--without-tuning \
 		--enable-fast-install
 }