summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgostino Sarubbo <ago@gentoo.org>2014-01-18 20:01:14 +0000
committerAgostino Sarubbo <ago@gentoo.org>2014-01-18 20:01:14 +0000
commit91a0463c1c6a1ca22f7fa9fbf902ed823f7378f7 (patch)
tree241371eb05a86d72280b51d60d85edfc93586b37 /media-video/ffmpeg
parentStable for alpha, wrt bug #492250 (diff)
downloadgentoo-2-91a0463c1c6a1ca22f7fa9fbf902ed823f7378f7.tar.gz
gentoo-2-91a0463c1c6a1ca22f7fa9fbf902ed823f7378f7.tar.bz2
gentoo-2-91a0463c1c6a1ca22f7fa9fbf902ed823f7378f7.zip
Stable for alpha, wrt bug #492252
(Portage version: 2.2.7/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.0.8.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index c34e24cd5416..a09a4408ec22 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.705 2014/01/16 20:10:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.706 2014/01/18 20:01:14 ago Exp $
+
+ 18 Jan 2014; Agostino Sarubbo <ago@gentoo.org> ffmpeg-1.0.8.ebuild:
+ Stable for alpha, wrt bug #492252
*ffmpeg-1.2.5 (16 Jan 2014)
diff --git a/media-video/ffmpeg/ffmpeg-1.0.8.ebuild b/media-video/ffmpeg/ffmpeg-1.0.8.ebuild
index 1bc0711159d6..955970f4b603 100644
--- a/media-video/ffmpeg/ffmpeg-1.0.8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.0.8.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.0.8.ebuild,v 1.10 2014/01/15 10:00:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.8.ebuild,v 1.11 2014/01/18 20:01:14 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="~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 bindist bluray +bzip2 cdio celt