x86 stable wrt bug #538798

Package-Manager: portage-2.2.18/cvs/Linux x86_64
RepoMan-Options: --include-arches="x86"
Manifest-Sign-Key: 0xA188FBD4

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 7e7fe13fc5355895028de7a798e43d69516e70e5..7a2b6d1c97d22b32f54dd22b0020c8e6dacb559c 100644 (file)
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.853 2015/04/18 10:45:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.854 2015/04/26 16:17:19 pacho Exp $
+
+  26 Apr 2015; Pacho Ramos <pacho@gentoo.org> ffmpeg-2.2.14.ebuild:
+  x86 stable wrt bug #538798
 
 *ffmpeg-2.2.15 (18 Apr 2015)
 

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 147db4b1ba89cb6cc47f32919e616e7f5a640550..4ba2008540622da0cc49d39217901e7c95a739ec 100644 (file)
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -18,18 +18,18 @@ EBUILD ffmpeg-0.10.16.ebuild 10077 SHA256 78a2ca42d92c398de9d68c8e9198eecf00a6a2
 EBUILD ffmpeg-1.0.10.ebuild 9713 SHA256 6d6ae75be2af88b036b9dff32a15ea2ccea74f02404f22c187de5c1cf0bfb400 SHA512 253a4bfba29398cd1fba6ac6e0f8b6fc5416fd9d86116a4f17af36ee7a50aa5767fa917ecf6f300ad01bef8b8bc58e37582cfedfe94820abd093c26a7f405127 WHIRLPOOL aa180cd1b8ee1d5ff373b02cb942c252daaf05fd4f5ad41155014c6752766ac7f3ad98381435b7999596f06249b64f41ad2955bb1856ece1c6cf88fb96c185f7
 EBUILD ffmpeg-1.2.12.ebuild 11006 SHA256 13469cba576174cfb78737018e18444f9b5ffb5ff963a6a84a67856aeda995d2 SHA512 4680ce2f34e946fffd588133eacbf341e08fd6954b249a50488a7b262d66ef87fa4e830ada253a9db731557fbcbc65b6f08b974a2b50b41c459918aa4b2a8e21 WHIRLPOOL 7142e4fe36428f6561b42da91471cd5f11c9978b0c27d59746371d746961280c1739b2840cbf9577f3808d8f6d8a80f4d42c29ca197c506b613624a34a6be318
 EBUILD ffmpeg-1.2.6-r1.ebuild 11049 SHA256 88d7665d4e89c851182da15a4b4345ff2b037fd26dad1b2e8b18795cc2a5dd02 SHA512 81aa531007bc9d981b32337a25db8b76770a415347b42885e88e6c330c089f2de84cc671783542a8d1c2b4cf59f3a4bf4520a7a0b2ed9c96528a5ea36fc80aeb WHIRLPOOL 830702c5a1f586a7cf655a0e804d4b60375a8bd41048a7dd0b05657459c66f5e2711fc1e6c712e16cdf073a4a5026a74776014e17d61fdf4ded7c22d98b5f0e3
-EBUILD ffmpeg-2.2.14.ebuild 12699 SHA256 3ace5438ddc21fb4b7dfa1d571648915349a7573ff333fc285b297dc0efcb6c2 SHA512 22d9cf2b0fc8bb78050d8cafca2c83c3ec0b5126de285c3f61fdefc2eb3ed9d00847d0329fb0ead7b5ac71fd9dc4b3d2c476ff189eac2256e27d574a1f2f4d49 WHIRLPOOL 03dfba2468b141ddf4105a804222d93ca88ee3e4a339a66d6eb44729773c35c329f56c3fc4c3088a3f7b1c55abfad863ad3c3a37d4adc28f93cee05831c35908
+EBUILD ffmpeg-2.2.14.ebuild 12696 SHA256 0ff74b84b5cb76837503863b9c0b525af517560b6855cee4f11a67428c59b766 SHA512 5c1fc5db5424f5b4d19bc53c8d43ba20b44af00e4ab18d96c7b491204cc35aec185bca25f525971aefd5a5a9e7f8a7f7079ceb2c5cca75cb51479f987f954789 WHIRLPOOL aa60386fc1da74ae51d92976e121aa1ed50091ab9f8a56245c6f3658e59231d12ee90b42c28d93ae77690a12d89c4a624b3b7c8f56585fb801af158a25b8abef
 EBUILD ffmpeg-2.2.15.ebuild 12702 SHA256 957e1d8213a22d08505afe07de6c77c160cffdcae980d35b6e7fecf11dc194a7 SHA512 33ee8de96354439dd9f17bbfa2d29c5d98824a6aafc8a22000dbb7cfc1e3f9e1d588e97f9c3712a1e18ca3b34253ae16927c968ca004086afbb3e81d413bf778 WHIRLPOOL 32675b0a4fb8970548bdb846dd980335a8a551f635f45ba9585b95ed9a9df2d8753ed9777f1c33a44ebca71f24ea7f85fc519dcd50e803108ca52883570b1f18
 EBUILD ffmpeg-2.6.1.ebuild 14650 SHA256 44a2bd7f2ce63a4d59214691fc8c46f94e5e4714121edc29f56c9a6774fe270b SHA512 aa5b3c43e0d1712f0339cf8b8372ab9fb2cd95ee1b48bd00d0c5b467fea8b9a724338483114d8258471a9a59ceff5c94b9f2b5b61bd19ee37f4cc4e8f892ec6b WHIRLPOOL a3147f3e23fba6a68fcc51802f7124d9f67948aa3e308df382186722a37b6af766a28b69c7bbf9a7956045b9d633573b3704685a4b211c1e1311066ef6107754
 EBUILD ffmpeg-2.6.2.ebuild 14650 SHA256 e22edd1a201c23a8a735263d456fa542ef90db969c16b13a8749d0167fb23e12 SHA512 cbab4e69842b6bee5e3bb5211dab98b3274e28afa22b5556dd608d581ac760221b5c85620be556290dc67489df565550498fad037a15d4cbb0ef7332fa3d0b24 WHIRLPOOL 416e3e0c8bea2121ae387c054d4e666415130072a411810d4f256ee6f57ef744f7235c919a322555c0570b933f69b6a740156b5eb9737120cb70daeabd926fec
 EBUILD ffmpeg-9999.ebuild 14651 SHA256 daa6cc812efc8461031450c6bf1a663fb0e82b268b0d4a2dba5b4f938384b328 SHA512 aa01550b1218120f73b7edb426b0c9dff410afaee537326306310667e2ee7b060fbc6cf6d873dc9c77e0b55c3a3f1096f81eb025e573cba07e65df99b1d1a12c WHIRLPOOL b46e549f4a78fb5566fe79b24e3007613f87fc6e65fd72930a60b6388b048f9d968bfee32c3f44751e57e79459db191bc6bccb4a9754d34440f16f74b090b915
-MISC ChangeLog 4983 SHA256 ad732180d9a003e2dbd3a4876e557e1417dc9b6fc1b812b1ff20cada127386af SHA512 5bb567ab3421b49db2d021770cecaa61fe05343738d10caeb757287a4a47ea57ef7616bdfd60b7c4b179e24fef27a2a132dff74fc23d4a7516fd23ed7c72e08c WHIRLPOOL f17d0dc81dbaca3146e661673cfc20254d1e31cfb686aa09d1655215576498597bd1c49c118aa99219215a1eedaef1d0fa9ff30f529cbb49dc6457446e845e2a
+MISC ChangeLog 5078 SHA256 0e98d912125d98bed211f02347262bf9af47c09dbeb9d69eb5d844b7ea0f3e38 SHA512 5e6d55cc56b796c19f39363e41a831123a2be113ccc1ff9b7fafae364038e2b717492b8c26aac9266d1d40e6b4310aeaadf92f5ef9e9e18f23df17f8462c9c03 WHIRLPOOL 257843071938ce0db8ab59a3db5dc6a71d2c10927963b5e03d95332362c3a5021e8e8529ac0dfa63f89dc3284d4a118fdc12ab6b536ff898d49f7783bbe750c0
 MISC ChangeLog-2014 113291 SHA256 4c06c33d7ce130dbe891dac8bbed5394756966a4317815651276b5354aa943ca SHA512 1bd9eb77e715e26a406bf58a543987caf24051dec4f7fd928f6d03af41bf4d952dcdda7c6237cb2ffb9517f04adb9f8fcaac91087fcc758c0836c754050c5ae9 WHIRLPOOL 99024abbc682eee208a9086d0a5450a8855b18a6e20e51e0a19403c0669420e8448b1fd20d5d7558c51c1cc661eb6d3d18623b1dfc42cba9c5fed64f7822b701
 MISC metadata.xml 4332 SHA256 b39edc51a5c5d68aefb52639412045287dbd670ab5b43a45b13c2c99d085f9a4 SHA512 0744c75f388ae01989b62cc34c49a665fc19dd8b0639c846a16c84a8db06a9cc571c2952df63857dac15bffca6975a0c872ea59c4f490639655f4eddd1b04ccb WHIRLPOOL ce3593918d35986256ee057520e69ebde51e4201e1d20e66f0367d7bf45e5a1a7301b5c7fa02ec327273702e426a2876a81e381c4af78251e729b2982abb41ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUyNeEACgkQvFcC4BYPU0rSqgCePLs7sKDaOv4AiNJ16dP6OipO
-NhAAn3N+BTTJ5B+KfxMyhhNKKkGZAqqx
-=oi6l
+iEYEAREIAAYFAlU9D5AACgkQCaWpQKGI+9Tr0wCeLWLLcgheQ8B9ald9bigeRfNE
+QdQAmwSHff9VZdQ4FGBcpCqxCSkOvaoW
+=MtJJ
 -----END PGP SIGNATURE-----

diff --git a/media-video/ffmpeg/ffmpeg-2.2.14.ebuild b/media-video/ffmpeg/ffmpeg-2.2.14.ebuild
index 410a2bc477aea7554572427fa7bbc692d48c99b0..edfe9e4945b7d32518d4ab5fee7ff826d815555c 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-2.2.14.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v 1.3 2015/04/11 12:09:46 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v 1.4 2015/04/26 16:17:19 pacho Exp $
 
 EAPI="5"
 
@@ -37,7 +37,7 @@ FFMPEG_REVISION="${PV#*_p}"
 LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
 SLOT="0/${FFMPEG_SUBSLOT}"
 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 amrenc bluray +bzip2 cdio celt