summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2015-05-15 07:44:00 +0000
committerPacho Ramos <pacho@gentoo.org>2015-05-15 07:44:00 +0000
commit24f5ab2e0d7cfa88be25d8223a050c079e99d9c2 (patch)
treed1c10980864f22dfba5faa998278cb587da212ed /media-video
parentppc stable, bug #526016 (diff)
downloadgentoo-2-24f5ab2e0d7cfa88be25d8223a050c079e99d9c2.tar.gz
gentoo-2-24f5ab2e0d7cfa88be25d8223a050c079e99d9c2.tar.bz2
gentoo-2-24f5ab2e0d7cfa88be25d8223a050c079e99d9c2.zip
ppc stable, bug #538798
(Portage version: 2.2.18/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.2.14.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 7a2b6d1c97d2..abb17eb7d3f6 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.854 2015/04/26 16:17:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.855 2015/05/15 07:44:00 pacho Exp $
+
+ 15 May 2015; Pacho Ramos <pacho@gentoo.org> ffmpeg-2.2.14.ebuild:
+ ppc stable, bug #538798
26 Apr 2015; Pacho Ramos <pacho@gentoo.org> ffmpeg-2.2.14.ebuild:
x86 stable wrt bug #538798
diff --git a/media-video/ffmpeg/ffmpeg-2.2.14.ebuild b/media-video/ffmpeg/ffmpeg-2.2.14.ebuild
index edfe9e4945b7..c39e2354028d 100644
--- 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.4 2015/04/26 16:17:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v 1.5 2015/05/15 07:44:00 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