From: Markus Meier <maekke@gentoo.org>
Date: Mon, 10 Oct 2011 21:24:00 +0000 (+0000)
Subject: arm stable, bug #385511
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f8731c3c1a88db035dfb6a59067859282b3fec89;p=gentoo.git

arm stable, bug #385511

Package-Manager: portage-2.1.10.23/cvs/Linux i686
---

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 75f8dc8c0cb1..0356d477b693 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.470 2011/10/09 18:16:46 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.471 2011/10/10 21:24:00 maekke Exp $
+
+  10 Oct 2011; Markus Meier <maekke@gentoo.org> ffmpeg-0.7.6.ebuild:
+  arm stable, bug #385511
 
   09 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> ffmpeg-0.7.6.ebuild:
   ppc/ppc64 stable wrt #385511
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 71e4e1b4049a..78b4f7c89eae 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -6,18 +6,16 @@ DIST ffmpeg-0.7.6.tar.bz2 4529035 RMD160 18641ae249d8b6f14f99013d1fccd85b0baddfa
 DIST ffmpeg-0.8.4.tar.bz2 4519099 RMD160 7ceaf8595b67564ff92529ff375b2457d6b6fa80 SHA1 70fc95f2711defe4953862bd42a5a228cee803b8 SHA256 c313c6645526f5a1af6f4bab0e401acfd1f908966858fdb7931ee4fd2cc54be7
 DIST ffmpeg-0.8.5.tar.bz2 4523772 RMD160 16659c26a5158aeee454ce555562ca059af6fa04 SHA1 a69d909958b23f8b2509ddda6cdeba2601edf5ff SHA256 f63df1ee08c2c64a4b3f106a88dd055b9f19e3457f1d7c23d8b8169e0a0ef115
 EBUILD ffmpeg-0.7.5.ebuild 8288 RMD160 02556fb1521f06440159b8b997556d8098812240 SHA1 da70c1829308237ae7f6010f6a31059feb2594a0 SHA256 94120a91db2130034c452f9a8d50f4edd3807ee3856610e42237dfb41a62acfe
-EBUILD ffmpeg-0.7.6.ebuild 8295 RMD160 34189240587571e90a15d4f94e49df6fec3a2b42 SHA1 fbbcd7cf0f8f104e4c85ce8a5d28864a5700be14 SHA256 075171a26412cb6f766e7e70f5aa0f5db40e7bdd4e68ad88b3e8f5ed8afbc855
+EBUILD ffmpeg-0.7.6.ebuild 8290 RMD160 50c0b4d48fc7673f0d4a9e5b5d941098eb915478 SHA1 18c0bab38e3cd375588c97b2f17825a94bbb15d5 SHA256 35e36d693cf65f7359feab8058555763075433db9fcf195bbf918c7821ae0a01
 EBUILD ffmpeg-0.8.4.ebuild 7830 RMD160 d5cd97a30fc588caca4ba3824a8109bd3a298d16 SHA1 8aea46ed3ce0dd70fac1c8a4553ba0791b74e270 SHA256 c4873bf468b1777c0c6c67ec2202f4ae429ceba246cd3edcc0f17b395844e322
 EBUILD ffmpeg-0.8.5.ebuild 7957 RMD160 6e36e2a9d2fa093900ac40959e845820d76ed0cb SHA1 f3e9ded0636709371afbb168370e988b1456b0c9 SHA256 66abdf62f56e1289cc44f37146bc7e6e7d17b9c3abc81b0efc39c8895db96b0c
 EBUILD ffmpeg-9999.ebuild 8205 RMD160 12d4ff89f2cea06e3d18b98d0669aefa25c85f99 SHA1 bf7a074fb7f300f6c8a354bc794de4f461b79a51 SHA256 63a91d00d22353bae2498b05530d3a8e3243c0a94a8c6995eefe66fefd42a803
-MISC ChangeLog 68250 RMD160 32526dfceb69776f749567dcb2cf4556df02ca51 SHA1 eaad8b2a8eb9a462d2d45c07be27ca392518e5cc SHA256 43cd10b8a4c3d98977833a286dca1aa6171e019929920cbee02af009ec7a5b79
+MISC ChangeLog 68342 RMD160 41d52ae407fb85ac5ff108ca174d6b587bdfa773 SHA1 eefd9b7959af6341d62a7b2e5f50a55b16da04f1 SHA256 02e3a4ef0605a0694994986c3446669e9e509b0f20a9d44614672719a76c9326
 MISC metadata.xml 2730 RMD160 30f7472831c62be2fd787b0c914681db7853361e SHA1 3a5abcd6fc24ce3e19497aa4b3d5cbf740ef7a4d SHA256 1e86d46c8891df413c68f98fe41e61691820fb66781717394a03327b907eeddc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk6R5RcACgkQIiMqcbOVdxT5vQP/R1eGpjQmd+wtBWPzwaz1426q
-YgLimKPpG50ZRq09YkpvMnQVlndzDF+sbnP6vzJw6zBbdjkaqV1KCHtqh0L3XW9e
-RcAl1iIlm7+S4fJoZBDiLJlnsBsJWbuKyeRVsSu43hIU7q3e2v1NmS5rvM+MgY0o
-kl6B9Qmtizlg7tftv/c=
-=QgQK
+iEYEARECAAYFAk6TYvkACgkQkKaRLQcq0GKcyQCeJljjz5WIvb8M3f+44JNnlg1o
+NwQAnilH9eoCuYaqOvofvhIiBxM62i+x
+=04f0
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.7.6.ebuild b/media-video/ffmpeg/ffmpeg-0.7.6.ebuild
index e19f548921b7..a986a87fd95e 100644
--- a/media-video/ffmpeg/ffmpeg-0.7.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.7.6.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.6.ebuild,v 1.5 2011/10/09 18:16:46 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7.6.ebuild,v 1.6 2011/10/10 21:24:00 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