bump to pre3

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 22 insertions, 25 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/Manifest b/media-video/vlc/Manifest
index 275bd5d295d7..0d963d1faf00 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -3,32 +3,22 @@ Hash: SHA1
 
 DIST vlc-1.1.12.tar.bz2 26220996 RMD160 117530abc8bd3f38d9233b7a7c91a3aaa17af87c SHA1 b39de66711a33746ce12f16a50e41d3def7b1452 SHA256 6dc50d27d25a0fab55b66f9ae3aa4001082d2d86b96b0491a8dab35423be1a68
 DIST vlc-1.1.13.tar.bz2 26226587 RMD160 c5aa438a9085ddbf28e849df442b75475693290d SHA1 05bbc7ff427f3b919b29a45ce014caff9ba92648 SHA256 03edec44d463b9f5e7db56fd844c6d4ac79966638e1ac32dedcfb5847a9323c1
-DIST vlc-1.2.0-pre1.tar.xz 16899100 RMD160 82f49619606bba26214b7c7206d0e592ec94f9bd SHA1 72b38f2c97cad4f143b16a2891f083bfab5b5174 SHA256 263bd69c5b0cf3b363d10896f373d6dc8b78feb208d51bcbc0d7260ef507ebc0
+DIST vlc-1.2.0-pre3.tar.xz 17215472 RMD160 908b0dad62215a114b664182d19131556aa0aea4 SHA1 ae8a37147fe35977eab2d9e1a876b8847ea13185 SHA256 d19efcd6c3dfe6b39eda44ac24af25f42d5df515129719fe0f425c8939d0a5d7
 DIST vlc-patches-101.tar.bz2 3011 RMD160 785ba728c04f025ca8377061e82c6c865d50a736 SHA1 e9be6b192bb3d69e4bd2387a9854543e0f8b3132 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae
 DIST vlc-patches-104.tar.bz2 3839 RMD160 bde7bd345b8082a82382f8c874d7ec2a9151382e SHA1 85729ea0889de759d8476c9571c2680fd31b588c SHA256 cb019bdea9ea95b7bbe2d2ef1194d276e93e1cf0e4e62403e80698c785f1a1ec
 DIST vlc-patches-99.tar.bz2 3353 RMD160 5e4961b7a6036ddcd609af1ce001f9be8cd6e525 SHA1 b26e969bcf05751fc0fe2ffd17b5be03d7a184aa SHA256 79b68b6879b737a714075d2437a7615525242412f7cf084277ace2cbeec567e9
 EBUILD vlc-1.1.12.ebuild 12443 RMD160 0f7d8e6fa9e24cf498e881a8365182702ab3356a SHA1 c2efc5e3ed66ceeea7c7fcc81a8666c1bd3da892 SHA256 8a3f7629154a5f8bba332a7d92156380abe1d2ba8a59865303fbf3ab34e317d4
 EBUILD vlc-1.1.13.ebuild 12195 RMD160 7edb31282180bb298c488b0f3ed1fa3283aab5e7 SHA1 21f9f66ebb9219c7a67a579e0d7e865309fff421 SHA256 c1ea8467d49da8a9fd1349d6d8365071281a2ccf9283bb8b87d5ebc48ca6b634
 EBUILD vlc-1.1.9999.ebuild 12203 RMD160 c01bd4a095afb95e134d0381c0a607d95c02a5c6 SHA1 260af6ab266b05e9cd9ee4f7650dea7b997b056d SHA256 613280dc3e31ede0759666fa39169e3bae7c9bc8d58941bfa59599e368e85212
-EBUILD vlc-1.2.0_pre1.ebuild 10912 RMD160 0fb3eefdff4f1d858549369ecbce7aed35a5efe2 SHA1 54fd68119c40a1be0faf9076809ca79e193944c7 SHA256 6fc3a47415476e1b76d775b7c9db0bfc3b725f99b6a11283d3b22835ad51a74a
+EBUILD vlc-1.2.0_pre3.ebuild 10921 RMD160 c54e89d71a420e36e2af6f397b316bfb8ae89004 SHA1 d76ba004de0d40faa3cc4a1a7d1face46f6f1dbe SHA256 6fbe9892435ee806b406e7d483fe104d6aa4b46823e37283ef798704ee4ce879
 EBUILD vlc-1.2.9999.ebuild 10919 RMD160 9119fbf3a03f90b46e1714388f5c01ef7d9f1c7d SHA1 97cd3995117b06e6a2a443d103561765b0747e10 SHA256 0ba93df71ad36b63e2ffb0c0aebe266100ae8ca584f0e27a2fa833d8da3b464b
 EBUILD vlc-9999.ebuild 10917 RMD160 f23f6fb0bf672361b674ddc2bcb2f9111f8cb173 SHA1 6dba975e44b69f95c6ad4ddf6d63258f7f5a3b00 SHA256 a75d591df2a956c482e159f3025e0f7a3c43725a2b89f0dc25fd06834855638e
-MISC ChangeLog 113664 RMD160 cf620fa21f95d669ec1f6875efdff3c14f9f8ef4 SHA1 a4ee632c85395448a07bfb6c640af2d2b102f988 SHA256 8f858f50a19819fa0addbcf4600cc21a5245f8afd95a0271892b3cbb9d14c6e6
-MISC metadata.xml 6589 RMD160 ab5b329732294a0a30a03ad4cdf08b1085dcf44a SHA1 8e4fc30a95e1a0a7f48875d6786ca85009d334f5 SHA256 b6d64afe5ef288be46fccf5a476efdbbfbe066b104e00fd952a12b545748447d
+MISC ChangeLog 113814 RMD160 d80350c9b11dd841388ba6fbfaddce454f9260e1 SHA1 c80d9ec25fb748bf62f772bb0a2d29bd04c4af6d SHA256 adc7b91c282fb0799b440206b21853db19d945c2f976f008ed13e3bcbcba7903
+MISC metadata.xml 6507 RMD160 bf45b299788330feff4c8616d9f5bb05c7491a9b SHA1 0f588c07de725272f6138b0c2a5d744e56007a42 SHA256 f09fad58e0fda5fb1be67e36dd35d0b1c105843e5d2b356c074106b1a2f01d15
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJO+f3fAAoJEPTTRK0uRVaNw0kP/1Ng9YZyCgGabK0e/3p6XhAJ
-gQtaNkYwml3QWyGtsgPinVd8HhwFVy/MgkRRzLoJfC1zuRg3fZDcenc/tSxPufU2
-kXiMdMn21hDo0zFDXjCvLeMwFTS9pFHxQEeVltKc3n1zzyic52otZgUEYmlE6rZt
-nQWuhigH9DObxrKX2O6U7S5ktA/e1LIGLa4qDPM0MSNpO/YLkX9ZeWh1u6MgCe+b
-ck2lvxzlxaYqf1Wnd7z4xB7TmREdZKXeN5s6NwMSnOO+vJV0H0cqgd50WeM8j6pc
-tqZ+iq6IsSlz+PXj1BY3cNDhLQngA6rMvUmY8lkSlVlZ4y4/E+jHrUy0C+eBdNUE
-pLR3P+31xy82yRMWLz7nAC143Fer9Nlj4+SEQKk7wephVXEAigstGDZfRzzJMabJ
-IyQDUnQcmvadEaJPnqK/B3eWFkGjgtgnyKRXvM5etbOmvgy698yJBMQzFEQUw14L
-DrvVDFfifG7fIUoJFgus0k0uDbhz9eAT7GhhPCIb1f/Y3GCV5WoPuwDraMUDa6Ul
-/M8KkVFlYEPQAHDZ1AnMlfg7mqFaeHJeI0M4+J8K0e4X4GTTzDA81pZzJUpOEXGL
-eP9j8Y/IRKM7l05srpUS1f4CtDuBvzutS9x9NuLvKP/G7CjhQ9S64gK1zXfa7p9K
-D4kVa8eVsdm+iCp448P/
-=hK7P
+iEYEARECAAYFAk7+8/kACgkQvFcC4BYPU0rHUACfdHxi//qDB9IZWJY1b6IIK8CM
+UEYAmwRShgCo4EqG3qbfpAxDbsA5ZiaF
+=/uCg
 -----END PGP SIGNATURE-----
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
 }