Revert previous commit.

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

4 files changed, 12 insertions, 28 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 107480074fb5..b606229a1d0e 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.797 2012/05/17 14:00:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.798 2012/05/18 02:22:49 chithanh Exp $
+
+  18 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  vlc-2.0.1.ebuild, vlc-9999.ebuild:
+  Revert previous commit.
 
   17 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> vlc-2.0.1.ebuild,
   vlc-2.0.9999.ebuild, vlc-9999.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 1eb37d6377c5..06a24b32d7fe 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,32 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST vlc-1.1.13.tar.bz2 26226587 RMD160 c5aa438a9085ddbf28e849df442b75475693290d SHA1 05bbc7ff427f3b919b29a45ce014caff9ba92648 SHA256 03edec44d463b9f5e7db56fd844c6d4ac79966638e1ac32dedcfb5847a9323c1
 DIST vlc-2.0.1.tar.xz 17210552 RMD160 9d932e1be72b65cf47057191d9e84deeedea282c SHA1 40d0ed360dd3fa7dc3ff4fbc9c319553ebb22538 SHA256 7f485725c17487a77d70844cbd9acf528360d65cd6ff79d206657920f4fcbf4b
 DIST vlc-patches-101.tar.bz2 3011 RMD160 785ba728c04f025ca8377061e82c6c865d50a736 SHA1 e9be6b192bb3d69e4bd2387a9854543e0f8b3132 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae
 DIST vlc-patches-105.tar.bz2 4325 RMD160 1fc8f5edc1f136c7074a5a00aabec583aec1cc58 SHA1 9f70e4a7ac7749da58b0134f4de79227a6b66c69 SHA256 e28047c097de2b1daa26b32227f11bb06d09a060b93c6ae2fe564094373f0778
 DIST vlc-patches-107.tar.bz2 4694 RMD160 341138714b59572bb4aaa7af96cfbebcfdd76d28 SHA1 60217caa88a35487a28eaab4f95e2dc6bae6ec98 SHA256 b371af609bd3d8ed11769b72b9bdb82bc231a8e2058c8965567ab4fa9363b4ca
 EBUILD vlc-1.1.13.ebuild 12191 RMD160 7b43ec8e6f9a15feca5539302bba2b03c759ea92 SHA1 f7783f88a746d7ab87c83345598259c3edf5116e SHA256 5bace9c8b7fbfc18f9668ccafa85aa5282cedbf7fb284571e0182fd6fe7ed80b
-EBUILD vlc-2.0.1.ebuild 11009 RMD160 8344929f6dbe4c427071a6076ec1d749e951f24e SHA1 574ad47c27aaf506cf72fb5eb67dfcaabedf4be7 SHA256 23c2c2a2817623b1c317430ff4e88584024c805b6e8f30e4b80314a2e22106a2
+EBUILD vlc-2.0.1.ebuild 11034 RMD160 ab1b907752e76d86f38b274ac7ae514ceb0db176 SHA1 91f3158531aee42f76003c89523c15bcc01c3c8d SHA256 9c8b034c4a3eca65d13d71678fd2d73f2a838604726e61333713e874e0c104c6
 EBUILD vlc-2.0.9999.ebuild 10996 RMD160 57103310c069a6f186f65b462f932b3fc1372370 SHA1 02557d1fefe02b6130b2266985547343206df932 SHA256 c210e5cbea683471e562249435ce0b9dd0d7fa9ca4fcb1c8889cd7dda1f61d73
-EBUILD vlc-9999.ebuild 10786 RMD160 1dc269dd43fde66d9ee6ba3737402b71956ec68d SHA1 592a6c5fefc8f9f26fbcaf695f05215021c6d55b SHA256 03482321e49441deae1fe19a69306f65443d643374800c4f39c650272afb6f63
-MISC ChangeLog 4403 RMD160 c0e4407dd60513e50f96d4df8bf6f998bae7c9b8 SHA1 ccc317ae2d112d857e9258969b5223f29a8c312c SHA256 feb7a9c337d259f778ae0a33eb2b3709b76582ab7a184b03830a4614dc06f1e6
+EBUILD vlc-9999.ebuild 10811 RMD160 67937219249f843d179fb10197b8f9d02188fe32 SHA1 288ec30997c29f2c2d82433ba9b8adf18fdf8944 SHA256 560562f8c0b5fc042c53ec1fedac0ef46a9c425f8139f45f79c57eff8439095c
+MISC ChangeLog 4535 RMD160 a2c16ef4191e72e86d04d72f0e1c4e86811886fd SHA1 0851b99324e2a35c64a6d5e5f4a7c33c8dcfe045 SHA256 20e7951051f5391f6bed09213778960a42e28764868a653a6e85e406415d7335
 MISC ChangeLog-2011 113818 RMD160 fbb86916aed66ae0a18a2b1f13d3c1dc9fdcaf7a SHA1 5e3dab004808f103ffae80563d33568e98f0d119 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2
 MISC metadata.xml 6552 RMD160 488f3c652c7618d7b380e00e4653f7dbb8a9889f SHA1 e4b180f82122f69d3e975b0f2957c4c414d9cc6d SHA256 fa3578af6d2d660fe8ffecf5fbc1601379d10f78ee3a2c0dc0632f4d424b9d3a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPtQRtAAoJEOSiRoyO7jvodawP+QFigi/eUvzQnMjxUJv9eao8
-4AXtXu1xaaNizgzqg+aFKLYGdlMp/6/6b2DljJvuV/WueLbv1ZIMq+KfkLi6gOiy
-LfEvTulzgtnZ7xS+B7+I0Gt5pS8ex2YXhHu35LdNtiTlUPgd7QODPwnTGFis2aPv
-xDG+3SDxB9dXPioRM02Z7CVXzIuJMI14viLouuXYtOOrdUGauGpWFtt01iSaFmo1
-Mnnxbs0S0zs29NMw75hn6e63gxmcZ1kTn2fSpMB9Pg/UUbEJmEvPtN1TrnYhLj/u
-vp+TY3yUrdG2Gzxpi4McVwlIW6pg+4Sm9pRaa1giDNMN0JBrY2rt06uOhY8PMFr+
-Q24TinWM8oo6r2qOW9YjcCfYhlrzLYPmK/UISLQu1W1glAwwAeCxGDE8kzYsgOY2
-DgLWU3v9YnhwpBSGBoYtO2sC35qSUlawU2QH2W04nztxfhwUuzytN8Ihm/Qi+g1v
-nFOQktCLHAYbEtFPyNhbiyNHd8afGfxHpqkz4GIZA/uF82hIAg371yQ3M+p/L2X8
-IJSJG+i2BLa3TXKUhjh9Cbv9m4F1bIeNnS6lY1owgzGPxi5TEPFEJ+/K0bXVdV0U
-L0D7UUOeNEWfihofpn78vGiqJecOw+sE1EiXkP8D15FeRdscZX0zGOHPMTSgBpET
-Gk4YdwgTbOVBZ/5GXSCe
-=d0uX
------END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-2.0.1.ebuild b/media-video/vlc/vlc-2.0.1.ebuild
index c9d889a43313..6e2b3931e03a 100644
--- a/media-video/vlc/vlc-2.0.1.ebuild
+++ b/media-video/vlc/vlc-2.0.1.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/vlc/vlc-2.0.1.ebuild,v 1.8 2012/05/17 14:00:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.1.ebuild,v 1.9 2012/05/18 02:22:49 chithanh Exp $
 
 EAPI="4"
 
@@ -112,7 +112,7 @@ RDEPEND="
 		opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 )
 		png? ( media-libs/libpng sys-libs/zlib )
 		portaudio? ( >=media-libs/portaudio-19_pre )
-		postproc? ( media-libs/libpostproc )
+		postproc? ( || ( media-libs/libpostproc media-video/ffmpeg ) )
 		projectm? ( media-libs/libprojectm )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
 		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 425c9b149fd5..5474923a4f48 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-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/vlc/vlc-9999.ebuild,v 1.170 2012/05/17 14:00:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.171 2012/05/18 02:22:49 chithanh Exp $
 
 EAPI="4"
 
@@ -111,7 +111,7 @@ RDEPEND="
 		ogg? ( media-libs/libogg )
 		opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 )
 		png? ( media-libs/libpng sys-libs/zlib )
-		postproc? ( media-libs/libpostproc )
+		postproc? ( || ( media-libs/libpostproc media-video/ffmpeg ) )
 		projectm? ( media-libs/libprojectm )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
 		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )