x86 stable, bug #382301

Package-Manager: portage-2.1.10.15/cvs/Linux x86_64

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 1f42c8d0c5ebaf3f14a4bf0a3df679b685185647..234b01d04ad56f5935ee63439ceed208da6cf8bf 100644 (file)
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.451 2011/09/10 17:54:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.452 2011/09/11 21:24:12 maekke Exp $
+
+  11 Sep 2011; Markus Meier <maekke@gentoo.org> ffmpeg-0.7.4.ebuild:
+  x86 stable, bug #382301
 
   10 Sep 2011; Jeroen Roovers <jer@gentoo.org> ffmpeg-0.7.4.ebuild:
   Stable for HPPA (bug #382301).

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 651bdff8758a5f6585bf80cb1b12ee10343617ca..fdac13e9c877a269543d54d46473a4242589d60a 100644 (file)
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -6,16 +6,16 @@ DIST ffmpeg-0.7.4.tar.bz2 4523220 RMD160 df886310ae02b851c02be531a67b5c140970af9
 DIST ffmpeg-0.8.2.tar.bz2 4509790 RMD160 d23f8a45a4f49f938e1553d122852a2ac3b50d76 SHA1 984f731aced1380840cd8e3576e8db0c2fd5537f SHA256 b7e8d989790a04619d19b1f8df419fdbb8cab29bea66e826b1bf00ab1c2edf12
 DIST ffmpeg-0.8.3.tar.bz2 4511737 RMD160 0550100988a579bd977b369fdd7cc472d41b420d SHA1 cea7bd5eb1c12fa5559610f9237aa8253b06f455 SHA256 d7ec82c9d5280b2d8dff2ac6ab9ab6a7d3a73c06db986fe16ae05931eb3c22ab
 EBUILD ffmpeg-0.7.3.ebuild 8288 RMD160 a8b52320bcdee95139496431f75ea9a05c480332 SHA1 e5e302359ca0f8a729ec6dc1c150bd9493a1381d SHA256 5090e36c3e59d2b073dbb6d84f963288047b029a914877200a2aeb1bf8d9b0b7
-EBUILD ffmpeg-0.7.4.ebuild 8292 RMD160 6cd12a2ac033fa009b4b590464f008424d144dc0 SHA1 8b5e336b522cfa7b8ccab9cc3a4e3d1b947143c6 SHA256 df64c31d239bc53e35a65a6ebe6c5b712a98b4c928eb0a08d7cc60e09ccb7fdd
+EBUILD ffmpeg-0.7.4.ebuild 8294 RMD160 696142d526b77fa6d9f6137cf712ff938d9925fa SHA1 e9de40115ce52ce4070c9fb4a946e7a2480d6d4c SHA256 33fe26c3890867a6efd3fa3f0211d7fedae9123d03bac41caa31168215ce7aa7
 EBUILD ffmpeg-0.8.2.ebuild 7830 RMD160 e4656d6311619f2f4fd09678df155a767facdef3 SHA1 5732d598d380e0fb9e22086fca403ba7479258fd SHA256 317a10414a0e56a62c358484c994cd4974574fc8e50c785d0c0de1e29ef951d7
 EBUILD ffmpeg-0.8.3.ebuild 7830 RMD160 47884592486b9b815d0df95dad8ea4e26ff3f1c3 SHA1 4f4821b15f620c89ca4849a15655783afd75118b SHA256 286d0cb270395742dd9b408ad423ef54333bbd5b16276720ae7187971960c392
 EBUILD ffmpeg-9999.ebuild 7943 RMD160 deb74cb744c267f91c2c73f2d4c0a5576f48aa2c SHA1 694c7c838918703a20a032b61b15d9d224076a6c SHA256 8335eda34bc16a16403cdc6564e7e88318e2f443b74c484b722f21f125f9af3a
-MISC ChangeLog 65994 RMD160 4a10b72f0714064a6825884baaa67fc756a00302 SHA1 9ba284667abc7e396ece049dc150ff0a3fd0227f SHA256 b5174178b60828894a1c341fac52c867d14f6df029bd250278b37ebda80ec41e
+MISC ChangeLog 66093 RMD160 38985dae0b031c44c1aeddfefec54ac94483edce SHA1 11ed20ffcbf7f7d2d9b8fc0db47b714a9d22f177 SHA256 2a685a5558d8d2d5eebc7bbc17bee8be5d51837e15511af4f2930f9191496928
 MISC metadata.xml 2557 RMD160 0278c4929e1bd11f10e3a6f4f0578ef8a82980b3 SHA1 422c3c91a871d2cdff5e01b346688b1358eb0d71 SHA256 ec87dac41c33172daab3f30011f6a7d3d5e7b543c3be855438304f8800a2efa6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5rpFsACgkQVWmRsqeSphPJVwCfUSdp0ayAfnDUT/JnMr5Q8Bn3
-uA0AnieTP3hgqKDDf0glS2HDHtbFQ7xz
-=iJEU
+iEYEARECAAYFAk5tJzYACgkQkKaRLQcq0GJzjACgk8HCyl253DaMNZPFi5UO4Wo8
+57oAoJtrfvrvAvZZF26gKborrJoL0i30
+=Ryt5
 -----END PGP SIGNATURE-----

diff --git a/media-video/ffmpeg/ffmpeg-0.7.4.ebuild b/media-video/ffmpeg/ffmpeg-0.7.4.ebuild
index 27b6727deca7a8d06474aac570a7808e6dd5d214..d5870ca109dd192c28dfd2a348b6375727969823 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-0.7.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.7.4.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/ffmpeg/ffmpeg-0.7.4.ebuild,v 1.2 2011/09/10 17:54:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7.4.ebuild,v 1.3 2011/09/11 21:24:12 maekke Exp $
 
 EAPI="2"
 
@@ -26,7 +26,7 @@ FFMPEG_REVISION="${PV#*_p}"
 LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
 SLOT="0"
 if [ "${PV#9999}" = "${PV}" ] ; then
-       KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+       KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 fi
 IUSE="
        +3dnow +3dnowext aac alsa altivec amr avx bindist +bzip2 celt cpudetection