Stable for alpha, wrt bug #512012

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x7194459F

3 files changed, 21 insertions, 18 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 89b897ac1add..ee95c4470bc4 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.782 2014/08/23 15:33:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.783 2014/08/25 11:02:41 ago Exp $
+
+  25 Aug 2014; Agostino Sarubbo <ago@gentoo.org> ffmpeg-1.2.6-r1.ebuild:
+  Stable for alpha, wrt bug #512012
 
   23 Aug 2014; Agostino Sarubbo <ago@gentoo.org> ffmpeg-1.2.6-r1.ebuild:
   Stable for ia64, wrt bug #512012
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index f3e6affe882f..8e3870e60fb8 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -24,7 +24,7 @@ EBUILD ffmpeg-0.10.15.ebuild 9938 SHA256 d4c3b812f56c3c610c42709836c2263912b4118
 EBUILD ffmpeg-1.0.10.ebuild 9661 SHA256 8e268c28be34d501171171af761494f37a26a8fe84293e9b8a05cf8bfd56ac76 SHA512 79781c15c09bff885f6f193e361bf8f929eca66903575fdfdb1188afc5d69c3bb6d0bd232d5eced7f4ac4a9c2f3aaff59a4164024e38bbd7f4c0a2c4a074c008 WHIRLPOOL 84e24bfc65736aa714a5506c9e8b1fa9e6ddc91e0c06e991e4598cdf1b85c1da68317fded1374fbfa6076f7a81c0da0cded87d7e3e9f2a1427d5218a59482fcf
 EBUILD ffmpeg-1.0.8.ebuild 9652 SHA256 1def1e010712626f090b7945a3fdd7134d39a6fbef32b589681675d5d9c41ec1 SHA512 5980171b00391cd8911c8a8e0e23648ee7bca693e6304b9440c81dba27cb8be7729e5dc32c3ecd52d95a683519e89b059ac235226a5e79bddb72e5c412fa8d3f WHIRLPOOL 6ce5c315b8fab1e2f9d7ddf322075cbf03f1cbbac4e189fc6642e859b0167dd0146084396fea2948c4feca625680a7db55d1c924dac3c1539bfb9e6b9a24f45c
 EBUILD ffmpeg-1.0.9.ebuild 9660 SHA256 e0ced5226a124b248e69a5203e03b94c32857b653d95e1ae04fcdd645b9497c0 SHA512 560d050a1fc529c8d662e06d84a3a8ee7eed4a9914d6499f0a3798be28bbb7939e20703156b0516da7afde802218f3ad971ab7d525edb73554a298bbea9dd021 WHIRLPOOL c8438ee1fae964cd0f1f7f6c61d089fa4336488b2e11ed6c34df47cb330e0265df338ea1133bc323c7869b4828f5dc00423ae945d13a54083627dd967451092e
-EBUILD ffmpeg-1.2.6-r1.ebuild 10971 SHA256 cf288cf2c6ec4bd90cb94cc2448a03590a6324452a475d83374d84454aff406f SHA512 e2d2792bc97ba5365f72170519b9bb4a5729263ddd742b53b81ab0c3f1b604eebaeb04d7dd3f812de4aeeb1e058bb25dc725d992cee96ff67f27864bf578ad6f WHIRLPOOL ad4ff49b25b1aa67f481ba947c553cd21dad8dba31150a4c2388056dc44952f68013da2d7226a77b00509ed41a9ee0405e5ac3e843c8df7442a8bdf9ea35eb58
+EBUILD ffmpeg-1.2.6-r1.ebuild 10970 SHA256 1ca1d3d34a6795d9dc14f8a7c02a9863d4c70bafa8eebec75e58897015b04828 SHA512 b2d07d51933a716460f7e936d3cfaec064d23f6263794548acc1fcd1120f10fa8d9e5be16c954e4e318e8b38bdd327083ae22b77f512ca574769898cfba5afa1 WHIRLPOOL 48b17a996ec526566beafec63ee12ceac66d05afe2faedb8fbb2601858ac0538ef0a69355847388a3d49eb459c29575cbaf84ff69ab36110ecd64b62da6a924d
 EBUILD ffmpeg-1.2.6.ebuild 8997 SHA256 04e7bc631ea399188fd9bed00c2d6c78e0113b1b197f55c31a1da002f92275de SHA512 3347cf697f21917b4bb4b669bc7da888d1e1d2207192e8a692d6f13eed2d091a6da85c44ef15592e12a3dbced218c5269bc8058da44c7b872882b21a71f3919f WHIRLPOOL 957a847757ca8fc032236fb5a97769a0a0aa2ed55a62913098fd8a915426ddf87fd4850d5c716222923d3f6564a0833f079de7e36faa4fdbfb9f0f7801476b0e
 EBUILD ffmpeg-1.2.7.ebuild 10927 SHA256 f93cbe16de7d436740fa321a3fb0522a3f0253aa55b14e520b40649da4120a93 SHA512 51bee7cb143fc16ab8bc5ddd7c0654db6d4de2831ac1c72ab816bc065e7f2768e162768c12ef78431534f97e0ab8687fe3225f288ada28ff530b3c9701adc922 WHIRLPOOL 4c4cfe485e234675b1dcb6dbfffff00f6c0016284b31d5d028ba44320819e75f0c9526cb17f38570bf638f72f8ad4a34c2a145df00692794497f91ddb3619cf1
 EBUILD ffmpeg-2.2.5.ebuild 12546 SHA256 11ec6d885b818f921292971e6f0f68475d79098db7ec9337f93a89bb3cda0b68 SHA512 819efcc55fba4f6303d908639043177ae5ad1dff1725deb5a30bacb7b467c286dd28ea6d4f0a1b2497aafb34bb34e1d4cc234ab95f8578b35a73aa7cc8589f08 WHIRLPOOL 47cebb40855574d41630a73013f0c82f7e6254f7dc53b6154620479c943a9a6a1269c417a06616432ecc7894f8231003ea900ae5774d84234bf6ef57564c6706
@@ -33,22 +33,22 @@ EBUILD ffmpeg-2.3.1.ebuild 12876 SHA256 cd2a1cf17e1b58d7d31fc65787089be2e4ac710f
 EBUILD ffmpeg-2.3.2.ebuild 12878 SHA256 d28e280bdbfcf4359ce1423e7ed9e40e660682590609081f90f1b0efdd894e33 SHA512 3393038a97601d0295e71bb34042586f6a83841c88acbe56b483f294852947443881c76968080e1103e49b386688a82ea0688f1c238dd9ca755a7b9819ea651d WHIRLPOOL 32dce92a63d9a79c5a27cf35fc2104dda77d24236ea85af2d8ec138a4955203c51cfe169c1acda11ca686934104b67ef17e04efb7e5d42a60dd0ed137b498184
 EBUILD ffmpeg-2.3.ebuild 12874 SHA256 621b96aa35556f50dd64c00e4023afd9faba85994833c60bddd167a895e9fe06 SHA512 2ce05f69d06b32c5927e9f5534abf16c033e4bb78dc933194f127791fe1bce9bb14c5919a61f72ff5a87c73be3d2342158fd18d9f7d477721455d37d76c330ea WHIRLPOOL 0cf637dfc3886412ac9d5dbf7fe5a487773be32df1de1971faa8257779917710b8caaa3ffd72942dee1cb7d302f39ed285f99efb94c14d96a5af26d622190852
 EBUILD ffmpeg-9999.ebuild 12921 SHA256 b02e76b4a98ff9a89e12411a28e969fe7111a64e995cb82d8f283300e28704ab SHA512 f30b00688447fad9c8a269173e17b7cfb701bf86fa0a464493840b516fb03a2fb5aa3576bf05d59001985dd7eaf41cb677d3be328c8914161eee642b50a29c38 WHIRLPOOL 0a50eb31cfedc0d8eaabbfdf975ef3d5242b9cf8d235f45612a063f915855464a4a166b9a4b61a27794642696fab48791c51ec3915c5d147259c091961f55960
-MISC ChangeLog 108489 SHA256 f3bd3c2b06662b82ba1766f2eacfc49c7313cad11708f347a05b4ea22f8ed418 SHA512 795e3148856a7a47da7a9e58dddd0783c934afc990ea9443dc5614a9ba1b1f0bb6e2366d2400c098bc8b27b70718374dcf87f0014816cf3636a8c2f0485bf23e WHIRLPOOL 3ac9aaf966c7e2e26e3217355b8e8383b2e98a8c180c59f64e3f068e58c8d74cdfd30aafc3a492852cf72a2b7ad5a3d4fea3b74ef47daa11b6e8ed707bc186d4
+MISC ChangeLog 108599 SHA256 7df36f8d5bb3c83583bcbf7bef56305cfaf62e5cdc56fafeaf08e4171ce1612a SHA512 3d79859e35390a5d7b61eb9f4e07d0588a0f91afd348646a0cfe9edefd28beee1a4abaf83a07f5cc0f30a9bfe85264194f462d99bbe25fc4d618cf0157de68e8 WHIRLPOOL 6db393aa38dd99a7510d6ce48e073f971a093fc141658eafe96740e2357b197f3bf3dd38871cb08b9e25e1317cdce6be025178637b67018f18970985f5b4d6c3
 MISC metadata.xml 5647 SHA256 359e839a7d9c3c36825bfae0e9217688785d279cebbfc440bd4074f5bc58fb9c SHA512 3efe9374ca61952911a6593417494092d9fd5465745a63e427dc74cbd6aa4af46277ec4865603daf5b27163c8db97823ff2b4eb857e88d73f3278e63a949e372 WHIRLPOOL fc5873ea67edea764b6ffff08862ad850a4bef83daed4a1ac03fc2cd9cfb8cb587561ce8fdee39a79fd6686b4605bebaaa0c00dac6a858e5d6f5ac563751ea20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT+LQ+AAoJELp701BxlEWfPgQP/1aG8swWoYTXRQ3KVWwwIFfr
-AhxcYlmF4a3FOtIqDpC2ce/9DAAy1rvT52QAqd2nn7pgdle6m7qDlTA6F3yAv525
-0RRpaXQn/6jCHseKKP0wTS9CSt1uUvlkuVYWDl6Abu7XSecgQNi/v1dA/V4ArVfz
-vcRyJRPtbtJGIB2IIQsni43bG/7dWEiJl2YlgH/GNIhWbIjCMvMLsgtByObU9kQZ
-Af7fa3nkUya/E/cxwrbXcRKKax1EuzbzDu6nULdGj4LkCNegGt9De3VxkahP38h0
-2LkR3jVW+TRgzE0w/GfhTmkpgZ1sKbyVdz8i/Le1ezuDiHBsOt+H3lEZlwjab2ka
-EfLMtG3pX8FoVaS475I2pUcVQBRS1AKbbaP0SzjXhhjhRTZPLSHsDiU3pEtHb8hK
-U8cl9APmQrIVDG56ARQFWY9mFdzv1siRHbyTBObL9z/MeJYUTgWHVMN8bbvsE33l
-70/B+BOPsUGnpT7qh1yjy3h+z+R0xQR0S7J6xsynp1jxkkr2x/NdAPegta/bFHzM
-DQ1fiqnH/lQ5xrWEt30ogeD6iuWUG0ET+eb8S+Vh9YdQbLbn9a0RePPTpCwTRsdY
-OdIpLGV/9AGGInox48UkfCOeQ0AkJzBOrClah92yuvYhiJtrfhvRX8f6LLnie/pI
-YKRpW2Z4OMHup/GSayN+
-=eUDr
+iQIcBAEBCAAGBQJT+xfSAAoJELp701BxlEWfBPAP/itEFob+an3ntaQnixZcPium
+snibLZa/frz94vcwxGcgxQsozvnFdV63c/9pNSTFQQBdlhWWp6RLh4exQzgSnI7V
+7DZp+gld2Ldt7zeW+hjwLcDc0V/o6Z6hAgukePlh4Hx6GAKsU26KlGYgeTCcdFEu
+/hA3yBEHHddNbgZn+/a++AarhBZThWVteAVt0uUQ6Jxx/SVyCJh4BKYPGrjcQXKF
+Hs9X+0xcqO0NAZPs5hgEvBXs8TYyCMGKfkhSGeRwVPK0wBmOJS7wTj0v3fHEPKn2
+Rw5MdmJ4Lt3lUF+HbcI3Ph+7D1thTkufVujdE6j+3Vkw2MqKj+ElDPzYaM2n42Vi
+j/YFoQ79Xo70qxKc7P3ONwn6Ent89VOH0oz628U92mmg/JdjgEWoHXlCeRZN3xQF
+b2Tokv6QGGHBsvXjzMYzvzTAjguNO9o1Isqq9qlA4sRo5FKJXFBPA96M/Zirje95
+mKvJ+DUie97+5ZpLi4obaxrAXr0gkG33CNh6BX+m5psBfSu8meZ3sd16wLuuBJZN
+cRiLDpmwj0DFa0kSgEztoc/IilW8PxN6AHgaS1Z4F1uJadykPBFVtcpQQIm+WKdm
+UjODv5UqED9zywzx8BHLPPGX0AanvxCs924YjaHKnZXavg6LFYPmmio+pJoACQVO
+CAA2HvopAisYZaQ3Hnso
+=83k0
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild
index 251e471dead2..770378f74c8d 100644
--- a/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v 1.11 2014/08/23 15:33:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v 1.12 2014/08/25 11:02:41 ago Exp $
 
 EAPI="4"
 
@@ -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 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 IUSE="
 	aac aacplus alsa amr bindist bluray +bzip2 cdio celt