summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgostino Sarubbo <ago@gentoo.org>2013-06-29 09:23:57 +0000
committerAgostino Sarubbo <ago@gentoo.org>2013-06-29 09:23:57 +0000
commitc6c89282e92cec4b7685e61c0177452272355b41 (patch)
tree49739bfd4f2549acf2098373c37e8b27d918cd0a /media-video/ffmpeg
parentRemove old version which has unsatisfiable dependencies. (diff)
downloadgentoo-2-c6c89282e92cec4b7685e61c0177452272355b41.tar.gz
gentoo-2-c6c89282e92cec4b7685e61c0177452272355b41.tar.bz2
gentoo-2-c6c89282e92cec4b7685e61c0177452272355b41.zip
Stable for amd64, wrt bug #473302
(Portage version: 2.1.12.9/cvs/Linux x86_64, RepoMan options: --include-arches="amd64", 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.7.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 42286a8af6ef..96a663c0557b 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.655 2013/06/15 15:49:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.656 2013/06/29 09:23:57 ago Exp $
+
+ 29 Jun 2013; Agostino Sarubbo <ago@gentoo.org> ffmpeg-1.0.7.ebuild:
+ Stable for amd64, wrt bug #473302
15 Jun 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild,
metadata.xml:
diff --git a/media-video/ffmpeg/ffmpeg-1.0.7.ebuild b/media-video/ffmpeg/ffmpeg-1.0.7.ebuild
index a24d8535d441..a769a222a2a8 100644
--- a/media-video/ffmpeg/ffmpeg-1.0.7.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.0.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.7.ebuild,v 1.3 2013/06/13 12:35:58 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.7.ebuild,v 1.4 2013/06/29 09:23:57 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+ KEYWORDS="amd64 ~arm ~hppa ~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