amd64 stable, bug 385511

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

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 1256498f9eaa07f0adfd3bb190f789eb289218ee..43cc69bba6e9ce30f5997000c19d2f6d05c1296f 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.466 2011/10/05 14:17:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.467 2011/10/06 19:39:50 beandog Exp $
+
+  06 Oct 2011; Steve Dibb <beandog@gentoo.org> ffmpeg-0.7.6.ebuild:
+  amd64 stable, bug 385511
 
   05 Oct 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
   add libmodplug support

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 2f8d90e606b7783348d6194745bc280e67772ea3..3aaf90c2fa765148982e2d30d2fb44e3ec22328f 100644 (file)
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST ffmpeg-0.7.5.tar.bz2 4526277 RMD160 6e2bcb7b57b7984c05c9c91c94f58ef9730adb72 SHA1 80dd1911c3fe14909fb3b9feeb9c2a0cb26d0aca SHA256 01d2cf6db491c5d2e6da8f9ca2e024d5cf6ac768f73b7a1c6b7fd686825a0556
 DIST ffmpeg-0.7.6.tar.bz2 4529035 RMD160 18641ae249d8b6f14f99013d1fccd85b0baddfa5 SHA1 0ea9ea769e195bf79d1b787acf253582481413b5 SHA256 f23265dc55fa8424872bc6cd026e340a367bc7eb4d5a6a32ca4aacb581b13cc2
 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 8298 RMD160 5c335c8c0b566644b8abd956b097497f3c08af45 SHA1 48079bdf1b0c42db360af5725abb87da2cd116e5 SHA256 662d21c1faaa25af22e13ae9c7173a966d7f99d1a2c29cf911251862d70d5a78
+EBUILD ffmpeg-0.7.6.ebuild 8296 RMD160 803023ca1a7c15e4c1cb849d1373cf22a2d85dec SHA1 f7f90d59171ac8dedb8881ca8d294eca48606672 SHA256 89c2e38bb53605d75b1b47b1dae9a73d64d7f3b073e8400b743215e15e2a574d
 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 67828 RMD160 3e8c22e8029b64bd81e0ac2c7d0b574b1789b655 SHA1 ec933533f5f0922add513d84430aa441f9adbb94 SHA256 ae9d9cb22778e161a46f8090f8f6676448a101e3e81873c1b1f07e96a5562ffc
+MISC ChangeLog 67923 RMD160 161f17374f7e9dd0e541e1ecee190142a450a2f8 SHA1 24efffcdf4d11573fb0dca6bbc37699623b41863 SHA256 f3b48b884ecd32fc262ca6f31a25f72d1ed96202750058aaa2ec643d692abf27
 MISC metadata.xml 2730 RMD160 30f7472831c62be2fd787b0c914681db7853361e SHA1 3a5abcd6fc24ce3e19497aa4b3d5cbf740ef7a4d SHA256 1e86d46c8891df413c68f98fe41e61691820fb66781717394a03327b907eeddc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk6MZxgACgkQvFcC4BYPU0oXqwCgt9knMXYI3tt/sAIWy1rYzeAF
-CTYAoMRdA6QoSGT9pUCFlxIMt0IKCsLa
-=WJnL
------END PGP SIGNATURE-----

diff --git a/media-video/ffmpeg/ffmpeg-0.7.6.ebuild b/media-video/ffmpeg/ffmpeg-0.7.6.ebuild
index 5e5cfecf3472d82955f099032118063bc1c57fc4..02bd194fb50a69f4afe3c140cdb1785f8dccfe50 100644 (file)
--- 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.1 2011/10/05 14:06:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7.6.ebuild,v 1.2 2011/10/06 19:39:50 beandog 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