cosmetics patch by Nikoli <nikoli@lavabit.com>, bug #324453

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index bf1eda8eaa8430bf4661f64960043cf9c77c7f0c..745b8d0256cf9982e6bc09d514f2b3246231903b 100644 (file)
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -7,13 +7,14 @@ DIST ffmpeg-0.6.tar.bz2 3720372 RMD160 1ff6a8f419239a03d84f67cc954f60f73632432a
 EBUILD ffmpeg-0.5_p20373.ebuild 7761 RMD160 872bb18a1eabab4c81cea1d4cf4f1283b14f4c34 SHA1 270130d83e1a5230102e2add113b9f3bbfe7a564 SHA256 81f73aa9857663d18734f0881bd5d8b648f9228dcec10a2dfb08bef262a1c1e9
 EBUILD ffmpeg-0.5_p22846.ebuild 7608 RMD160 d4a4c505829c6fd6c93e1e6ec465028a0997989e SHA1 46e7764045594b636d0eb6179f464e3f378b4895 SHA256 227cbee58e559eab07d0d97dbccbd2212b56be6c60cc7a57436894ac3b10e63d
 EBUILD ffmpeg-0.6.ebuild 7808 RMD160 0b39b664e9bb620b87865541b4e3c698c86da286 SHA1 7723509cc581138f302be0ca4409327bf35c3aa2 SHA256 c9ae2bc6a3b87cf761e7a7503674f642bebd8394e0e4effd3ffc895bd04e563f
-EBUILD ffmpeg-9999-r1.ebuild 7852 RMD160 ad55ebbed7ab940b91daf897e7d1ebcdee70e4a0 SHA1 c8921d84e419f96e03f67eb5d2ee707666b649e1 SHA256 cbce8d2822827e15829b9a1d40206b8a3fa472bb3deccc09b84988c45da1ed71
+EBUILD ffmpeg-9999-r1.ebuild 7850 RMD160 ce6d6f8708468dedc4dcfda71afce2b64b4958a6 SHA1 05553e68e438febdb28c1a4f1100054648349b58 SHA256 1894ed10c5dd571f73792352725e096559211f616d3d13b9f5d56ac7c343eeaa
 MISC ChangeLog 53566 RMD160 bf3bbe8093e793e907513b568359ed26bcdd4038 SHA1 756ba2a242f78853706236fcefd9467cf15b89ad SHA256 e78f2743e3c05110460cf9b5da3f008265e2995d329153cbcd1e1063053524dd
+MISC ffmpeg-9999-r1.ebuild.orig 7852 RMD160 ad55ebbed7ab940b91daf897e7d1ebcdee70e4a0 SHA1 c8921d84e419f96e03f67eb5d2ee707666b649e1 SHA256 cbce8d2822827e15829b9a1d40206b8a3fa472bb3deccc09b84988c45da1ed71
 MISC metadata.xml 1973 RMD160 b94286038640659efda908f1141ebd49dd5fb19a SHA1 80ecb91c771d75606ba135b5f9447649461ca8c9 SHA256 831b6526385ea8e4877d47748f0a27e6983bb42ac879ed7a177104aec0189e95
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwbF04ACgkQvFcC4BYPU0rRjQCeJEljWK2r0trDxmWJ/i3NL04D
-PjMAoJlSXMvKkhibPBdVnNbWT0h7tWvN
-=9bAy
+iEYEARECAAYFAkwbGMEACgkQvFcC4BYPU0oYEwCgs35VCAHqeCaE7nfYivN54hbI
+1IkAmQHrSE7XVGRKi72auntkWbv+ekNs
+=FQLh
 -----END PGP SIGNATURE-----

diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index a779907adfcabb8529987a96a6a89c64782ac49a..75f894e68774312cadc863de225a1967c7b05940 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.41 2010/06/18 06:50:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.42 2010/06/18 06:57:00 aballier Exp $
 
 EAPI="2"
 
@@ -138,8 +138,7 @@ src_configure() {
        use threads && myconf="${myconf} --enable-pthreads"
 
        # Decoders
-       use amr && myconf="${myconf} --enable-libopencore-amrwb
-               --enable-libopencore-amrnb"
+       use amr && myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb"
        for i in gsm faad dirac rtmp schroedinger speex vpx; do
                use ${i} && myconf="${myconf} --enable-lib${i}"
        done