diff options
author | Mikle Kolyada <zlogene@gentoo.org> | 2015-06-28 10:20:29 +0000 |
---|---|---|
committer | Mikle Kolyada <zlogene@gentoo.org> | 2015-06-28 10:20:29 +0000 |
commit | fbcf88c60ade6f1b37c3164904f44924af51dabc (patch) | |
tree | 73168783f44b87d28c1a51011a5979f6c48dc47b /media-video | |
parent | DEPEND on yelp-tools is needed (#553476 by Kris Couck), drop old (diff) | |
download | gentoo-2-fbcf88c60ade6f1b37c3164904f44924af51dabc.tar.gz gentoo-2-fbcf88c60ade6f1b37c3164904f44924af51dabc.tar.bz2 gentoo-2-fbcf88c60ade6f1b37c3164904f44924af51dabc.zip |
x86 stable wrt bug #547462
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xC42EB5D6)
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-2.6.3.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 204bca824c03..3f438b3e316b 100644 --- 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.869 2015/06/26 14:42:25 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.870 2015/06/28 10:20:29 zlogene Exp $ + + 28 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> ffmpeg-2.6.3.ebuild: + x86 stable wrt bug #547462 26 Jun 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild, metadata.xml: diff --git a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild index 243fad0fca6c..d4ac465135e0 100644 --- a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild +++ b/media-video/ffmpeg/ffmpeg-2.6.3.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.6.3.ebuild,v 1.4 2015/06/14 19:42:22 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild,v 1.5 2015/06/28 10:20:29 zlogene Exp $ EAPI="5" @@ -55,7 +55,7 @@ LICENSE=" samba? ( GPL-3 ) " 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 # Options to use as use_enable in the foo[:bar] form. |