libvorbis encoder is back, reflect the change into the ebuild

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

3 files changed, 13 insertions, 10 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 0238ecbd67cc..49f782f33902 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.549 2012/05/08 22:49:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.550 2012/05/12 00:24:23 aballier Exp $
+
+  12 May 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
+  libvorbis encoder is back, reflect the change into the ebuild
 
 *ffmpeg-0.10.3 (08 May 2012)
 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 726eb51266f9..e8edb94f0384 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -11,13 +11,13 @@ EBUILD ffmpeg-0.10.2.ebuild 8532 RMD160 9f6760709b468df7b7e04b7728eab6936d976aea
 EBUILD ffmpeg-0.10.3.ebuild 8540 RMD160 acdb015eaa1ecc2030e4d23295385d43ec261616 SHA1 1c661719a507b173643e081825e9175087644557 SHA256 d47189b8a8b5a20ad24db775dba6b8c3765db45d41d9d6fac223b9d158706acd
 EBUILD ffmpeg-0.10.ebuild 8284 RMD160 eca13e33e17c0125f32f1a7f457f10636f43444f SHA1 696a3df947b423906cd53de14535532d20c807da SHA256 5741783a9cd7e746457ac0baffe7e94c000fd71f97d7ce6da090b401d7c4b6d0
 EBUILD ffmpeg-0.7.8.ebuild 8428 RMD160 c6804416bdc363db40967b9f671e244d87a7f582 SHA1 41139b2cef4748948470866ca13934ff0ce57de9 SHA256 f8caeeb09503b6b6263d716e8030f876e2039ddfdb1a6ae7dca39e04fdf6e1aa
-EBUILD ffmpeg-9999.ebuild 8597 RMD160 fb7cd8547b00cb0dea05e69b96a08eca21bca551 SHA1 b11b70ceb70f9e0de7c1615ebbb2317037cb9a48 SHA256 3c7ec0c140aa706300e2edfd1b1989361786086d232a120b763cc4f83036b65b
-MISC ChangeLog 77971 RMD160 43c1ccd9ce877a9c447fdd6e54b0582698de1fab SHA1 46b3da28ca0e8f54597c904c263ac304c8cf2b4e SHA256 4e3a38f24126dddac311dedc251bc0d5cb5761c9eb4ba074d0f4b5b8fbee22d6
+EBUILD ffmpeg-9999.ebuild 8598 RMD160 38f8a510b31d533b42b3d145af7a27a563f6bb26 SHA1 41921e2b7fd6b6d3825757deb4195bf0e14a8c3e SHA256 a3531810b79223b3dbbe22303eee612a98f05a5f11ce74270ccba69dcd92807c
+MISC ChangeLog 78108 RMD160 e5cf5d9899775e708cb654c3bb9ebbd32a93d022 SHA1 f8d566c69c9e1f2fc28dbd7473e009e4e05ec7cb SHA256 5f5b8bf2f8da2f458e45951904555e31aed20bd25c048f68ff0d0ffd95764f70
 MISC metadata.xml 3122 RMD160 6263ca0c7ee124af6e229139858a5f5918a1b899 SHA1 25c26812e525fb99a933d55d7713ae43e41ed8bd SHA256 68989560c9de314d276ca99945817a58873b793f48e318ccf67cf2c7f0d7fa54
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+pouoACgkQvFcC4BYPU0qMkQCgkxFihnut9fVP5o055hMsXQWM
-kH0An3kAC3R86Koax8b5hLY4BZ1AAWMY
-=kkvn
+iEYEARECAAYFAk+trb0ACgkQvFcC4BYPU0pUHACeJCdKqZWh71L9CWlCo8AziA1U
+wdgAoL/jW/WDXxxdTGLRXkgDxN26KvE3
+=tHug
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index ac4317e4ec06..f0896d59cf9f 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.89 2012/05/05 08:58:57 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.90 2012/05/12 00:24:23 aballier Exp $
 
 EAPI="4"
 
@@ -65,7 +65,6 @@ RDEPEND="
 		faac? ( media-libs/faac )
 		mp3? ( >=media-sound/lame-3.98.3 )
 		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
-		vorbis? ( media-libs/libvorbis media-libs/libogg )
 		x264? ( >=media-libs/x264-0.0.20111017 )
 		xvid? ( >=media-libs/xvid-1.1.0 )
 	)
@@ -87,6 +86,7 @@ RDEPEND="
 	truetype? ( media-libs/freetype:2 )
 	vaapi? ( >=x11-libs/libva-0.32 )
 	vdpau? ( x11-libs/libvdpau )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )
 	vpx? ( >=media-libs/libvpx-0.9.6 )
 	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
 	zlib? ( sys-libs/zlib )
@@ -145,7 +145,7 @@ src_configure() {
 		use mp3 && myconf="${myconf} --enable-libmp3lame"
 		use aac && { myconf="${myconf} --enable-libvo-aacenc" ; version3=" --enable-version3" ; }
 		use amr && { myconf="${myconf} --enable-libvo-amrwbenc" ; version3=" --enable-version3" ; }
-		for i in theora vorbis x264 xvid; do
+		for i in theora x264 xvid; do
 			use ${i} && myconf="${myconf} --enable-lib${i}"
 		done
 		use aacplus && myconf="${myconf} --enable-libaacplus --enable-nonfree"
@@ -184,7 +184,7 @@ src_configure() {
 
 	# Decoders
 	use amr && { myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" ; version3=" --enable-version3" ; }
-	for i in bluray celt gsm modplug rtmp schroedinger speex vpx; do
+	for i in bluray celt gsm modplug rtmp schroedinger speex vorbis vpx; do
 		use ${i} && myconf="${myconf} --enable-lib${i}"
 	done
 	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"