summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2015-06-05 16:33:53 +0000
committerPacho Ramos <pacho@gentoo.org>2015-06-05 16:33:53 +0000
commit67adedcafbc71f11add6714e9b48ccfe36e855fc (patch)
tree00386125612512570a70cc3725b0126c4a58da16 /media-video
parentamd64 stable, bug #549056 (diff)
downloadgentoo-2-67adedcafbc71f11add6714e9b48ccfe36e855fc.tar.gz
gentoo-2-67adedcafbc71f11add6714e9b48ccfe36e855fc.tar.bz2
gentoo-2-67adedcafbc71f11add6714e9b48ccfe36e855fc.zip
amd64 stable, bug #547462
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/ffmpeg-2.6.3.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 1d87543b057b..05d3930da901 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.863 2015/05/30 10:55:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.864 2015/06/05 16:33:53 pacho Exp $
+
+ 05 Jun 2015; Pacho Ramos <pacho@gentoo.org> ffmpeg-2.6.3.ebuild:
+ amd64 stable, bug #547462
30 May 2015; Markus Meier <maekke@gentoo.org> ffmpeg-2.2.14.ebuild:
arm stable, bug #538798
diff --git a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
index db1413a40eb1..feb8351a937f 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.2 2015/05/29 09:45:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild,v 1.3 2015/06/05 16:33:53 pacho 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.