Stable on amd64 wrt bug #382301

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

3 files changed, 23 insertions, 10 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 958828bd0b65..df60a494552e 100644
--- 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.453 2011/09/12 21:10:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.454 2011/09/13 09:53:19 hwoarang Exp $
+
+  13 Sep 2011; Markos Chandras <hwoarang@gentoo.org> ffmpeg-0.7.4.ebuild:
+  Stable on amd64 wrt bug #382301
 
   12 Sep 2011; Markus Meier <maekke@gentoo.org> ffmpeg-0.7.4.ebuild:
   arm stable, bug #382301
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 058d9a471e48..4715908544db 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,21 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 DIST ffmpeg-0.7.3.tar.bz2 4522604 RMD160 30da423b0a56efb6273a9a59b47a6cfe237278e2 SHA1 8a5e0e6bfffe491775da0d65a614e358038c44b4 SHA256 58ee859d9c4f5c477ea5bd0dd8e6848ce3af8b6c0ffe3b556612d437e85abb17
 DIST ffmpeg-0.7.4.tar.bz2 4523220 RMD160 df886310ae02b851c02be531a67b5c140970af96 SHA1 f528ef9eaa224acd970710d6a408f2ff03b39544 SHA256 3ec851e77b656bf16a16c122457c9db2340175b48b2c327e6f00e9e173f09669
 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 8293 RMD160 003ac4633733221e31a3a7148d088cef8d7fdb04 SHA1 5eb385a68ee39689f7000ada32903adffc396eca SHA256 1d84285233eb694a1641f13f5f0f4c832c33f7a9879632a5ff8b2a37e33e6298
+EBUILD ffmpeg-0.7.4.ebuild 8294 RMD160 4a22064332bae4813d457afccdef36dfe744e303 SHA1 da543d329ec5322e31217f0375f8e5f61a3cbf14 SHA256 2258db4fb3441833cf7ecc1f643570cead84dc3267f1c158914c676281567ef5
 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 66189 RMD160 1ab9407d7ca28dba55d46dc93e25d7ea9e034eca SHA1 59149d5d830b7a3f1ea312adb25f59f3f370c01d SHA256 c9912f465a54022d64ebbf16784c9e0f978fdf1786b5f9c816370bd7f336cbf5
+MISC ChangeLog 66300 RMD160 30c9784cebce2e09fc3f7886baf9fd9a7316951b SHA1 ab861bf4a0f97f52729812dc9d8d87190b9e73b3 SHA256 6a2160b23a3f29c74fa9e5e7129c4a217b10266cfe2050e2ab8ce37e40ef8991
 MISC metadata.xml 2557 RMD160 0278c4929e1bd11f10e3a6f4f0578ef8a82980b3 SHA1 422c3c91a871d2cdff5e01b346688b1358eb0d71 SHA256 ec87dac41c33172daab3f30011f6a7d3d5e7b543c3be855438304f8800a2efa6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5udXwACgkQkKaRLQcq0GKXiQCfQ80uNP5iQoGCuEBcad8Yla/J
-77UAoJWI25DT9hWoZCE27preAToNTlsS
-=mlfq
+iQIcBAEBCgAGBQJObygQAAoJEPqDWhW0r/LC/0IP/1DCSSoX44ysZRK3NQlBgXK/
+ZSrE/Nb6yrjJhOxaLbLIegHqEXX/faLAfRuerqKMP5C6YB1EyiJWJz5kdUxa1H6F
+eM88SgzzrpyTrHn/mSCgV2HCoeNIy1fOnkTrUS4+OopQsTdbYcknQc+5X7hRKyt4
+hNTustusPi/cISS6DDVf3BHjGiUKGN9coWTP93RVsBOY3j/Dz31+w6Gn6ohoSXl/
+gIXlpim3qsqnHRbd99owFNLIh7i+Sd3h3yNlwLLK3ZlW4/KZnrdO3mop+FJ7lsYr
+1OK6wm1LO0ESlYI3HgbXQe0Icexe/DE2640Msozrv1rNLkR6POp5zwZNU4G3woaY
+3Nq/k+bKUufZ0QWkf5GOH+BFvSBTWqwn3A0Cg//96RdYo0pya6JbYp11QcpILPA2
+mETxGxNExRuPzjYXnuwsjLNUq/jUVnfzIuEywJpqOpOOwEq9S8WoRQQKcXlst6JI
+EA5Iw1+wdN7FZPE+hPkmrJiW4E576X8cETm0Ald6OwYtWEhMa8MflSagbJrkLPOX
+tOTVCV3GCpxtAAPOhs8R9UxNkEHET/a1E1y9qqqZQem6tOYA0MPV67X8gXkBNfy+
+FGOPrWwwjOPiQhrHKBqVdO906aCGySbsTeIMKYEgdhUama9l/NJqo+1tM65OfQpF
+XW37mNqAWXHKzsxZ2ZP/
+=BhuG
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.7.4.ebuild b/media-video/ffmpeg/ffmpeg-0.7.4.ebuild
index fd7e0ce0645b..1f4548964ed6 100644
--- 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.4 2011/09/12 21:10:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7.4.ebuild,v 1.5 2011/09/13 09:53:19 hwoarang 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