summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgostino Sarubbo <ago@gentoo.org>2014-06-08 12:25:42 +0000
committerAgostino Sarubbo <ago@gentoo.org>2014-06-08 12:25:42 +0000
commitddb3e7488b051ee1a6a3b1d5704c0d73d95611d7 (patch)
tree53490e6e25542210831c62bea429c6743195b60e /media-video/ffmpeg
parentStable for ia64, wrt bug #508372 (diff)
downloadgentoo-2-ddb3e7488b051ee1a6a3b1d5704c0d73d95611d7.tar.gz
gentoo-2-ddb3e7488b051ee1a6a3b1d5704c0d73d95611d7.tar.bz2
gentoo-2-ddb3e7488b051ee1a6a3b1d5704c0d73d95611d7.zip
Stable for alpha, wrt bug #508372
(Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --include-arches="alpha", signed Manifest commit with key 7194459F)
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/ffmpeg-1.2.6.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 8213863415f8..2bfd6738ec8f 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.744 2014/06/08 12:24:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.745 2014/06/08 12:25:42 ago Exp $
+
+ 08 Jun 2014; Agostino Sarubbo <ago@gentoo.org> ffmpeg-1.2.6.ebuild:
+ Stable for alpha, wrt bug #508372
08 Jun 2014; Agostino Sarubbo <ago@gentoo.org> ffmpeg-1.2.6.ebuild:
Stable for ia64, wrt bug #508372
diff --git a/media-video/ffmpeg/ffmpeg-1.2.6.ebuild b/media-video/ffmpeg/ffmpeg-1.2.6.ebuild
index 608ab1393bf2..78eab3ff298a 100644
--- a/media-video/ffmpeg/ffmpeg-1.2.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.2.6.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.ebuild,v 1.10 2014/06/08 12:24:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6.ebuild,v 1.11 2014/06/08 12:25:42 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="amd64 arm hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
fi
IUSE="
aac aacplus alsa amr bindist bluray +bzip2 cdio celt