From e55d09a2d84ef40dec0210f663c2f492a78db9f8 Mon Sep 17 00:00:00 2001
From: Markus Meier <maekke@gentoo.org>
Date: Sun, 22 Apr 2012 12:20:47 +0000
Subject: x86 stable, bug #412123

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64
---
 virtual/ffmpeg/ChangeLog               |  5 ++++-
 virtual/ffmpeg/Manifest                | 12 ++++++------
 virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild |  4 ++--
 3 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'virtual')

diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog
index 847794848301..2b3a19f3b87a 100644
--- a/virtual/ffmpeg/ChangeLog
+++ b/virtual/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for virtual/ffmpeg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.30 2012/04/21 12:03:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.31 2012/04/22 12:20:47 maekke Exp $
+
+  22 Apr 2012; Markus Meier <maekke@gentoo.org> ffmpeg-0.10.2-r1.ebuild:
+  x86 stable, bug #412123
 
   21 Apr 2012; Markus Meier <maekke@gentoo.org> ffmpeg-0.10.2-r1.ebuild:
   arm stable, bug #412123
diff --git a/virtual/ffmpeg/Manifest b/virtual/ffmpeg/Manifest
index dbd1c7ccabb5..a19c6311fe8a 100644
--- a/virtual/ffmpeg/Manifest
+++ b/virtual/ffmpeg/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD ffmpeg-0.10.2-r1.ebuild 719 RMD160 aaf492333bc93e51c3f9b12f16f6f30f1a44b92a SHA1 d38ad36f33b0b315cbe8867e29c0a41d1fa2143b SHA256 a65aa18cea55f2a65780d38da32fedc107b33c669d5e3c47bbf39c951a2af65f
+EBUILD ffmpeg-0.10.2-r1.ebuild 718 RMD160 b888e11ca01beaf9991db7916402044e3ab61c9c SHA1 cc1639635c2d1a2427dac2ea7205ecbf9f591413 SHA256 97c219dc5e44dccfffdff8e29f3813433714ef4fbee77a6a6ad0d2244282cd0c
 EBUILD ffmpeg-0.6-r1.ebuild 654 RMD160 8c376598e0b5b75507a130a1837893d1ecf2efd2 SHA1 9a491f53969693edd3c47a3c9377de1362fbe4a1 SHA256 0829565f40df363e2f13de3406d40098332ebd1bb70c49c2d128532a02fdee6c
 EBUILD ffmpeg-0.6.90.ebuild 699 RMD160 efe4738ec1285b23a1ba325776c80e09fa743e8d SHA1 28fa2d8fabf3686a488a1f61b50362c4939d92e3 SHA256 fb038e00b5b99ce7da9dfef8c982e6ad97cf80ffe13d63e465561e6dd29dd9ae
 EBUILD ffmpeg-0.9.ebuild 695 RMD160 5f7a88d66c3f8ad55f987133784d4f549e5bcc26 SHA1 76494acc0af377aab98c74bf72e8d44988a7c43e SHA256 387dd7e3d58e96ad31cfd514837413621382c7a1eb75d63c7271ab9c0cf87151
-MISC ChangeLog 4887 RMD160 7d795a9ed8ce6a4edec73080fa913fdcba3e3eb9 SHA1 3fb7e70cf26174efc3459d4abb765f15df2ce9e5 SHA256 d5efb4f48fd73b6cfd0afe64bbea53d933f3589b28408da5c56c546e2e035f13
+MISC ChangeLog 4987 RMD160 fb58f5e856a50923121cf555da51eb2cb4b5cd49 SHA1 d15f4053c5270b011f0808bf636bc4cc8e7e8bbf SHA256 71b92492e42c536a57257ac9059aa31ac88e9eed96d0243dd7b616080af845df
 MISC metadata.xml 444 RMD160 fc60036f4c1ac0da29830090aa021ccc2e9cbe98 SHA1 82f158dc39f1300bf473282a3ce916534f0e44f1 SHA256 cef0fff52fc751969934693172e0c5f23fea1bddb44b0dc0ed68cb7bc00d1770
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+SoscACgkQkKaRLQcq0GLbUACfTbo39Vy/8YYviHR7g9aYEOqz
-88AAn3z19VxU0j3aHRnuMkOCsd7CDhve
-=iyJm
+iEYEARECAAYFAk+T+FQACgkQkKaRLQcq0GKU+gCgrXGwnfzXCG8cOnTn6tL4AWAL
+jpEAnR5tc2EJWTVRcTf0Ay+M1DDnIq/f
+=MamL
 -----END PGP SIGNATURE-----
diff --git a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild b/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild
index 9d93e2421144..e3ed9aef85a5 100644
--- a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild
+++ b/virtual/ffmpeg/ffmpeg-0.10.2-r1.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/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild,v 1.4 2012/04/21 12:03:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild,v 1.5 2012/04/22 12:20:47 maekke Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="X +encode jpeg2k mp3 sdl theora threads truetype vaapi vdpau x264"
 
 RDEPEND="
-- 
cgit v1.2.3-65-gdbad