summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-09-20 16:48:24 +0000
committerMike Frysinger <vapier@gentoo.org>2010-09-20 16:48:24 +0000
commit544141b0d3989509cc67c83faa89dfb5a0947d10 (patch)
tree393353d82bec2ef8fe6939ca2aedc43bde6dd038
parentVersion bump (bug #338197). (diff)
downloadgentoo-2-544141b0d3989509cc67c83faa89dfb5a0947d10.tar.gz
gentoo-2-544141b0d3989509cc67c83faa89dfb5a0947d10.tar.bz2
gentoo-2-544141b0d3989509cc67c83faa89dfb5a0947d10.zip
Drop empty KEYWORDS to keep ekeyword happy.
(Portage version: 2.2_rc83/cvs/Linux x86_64)
-rw-r--r--media-video/ffmpeg/ChangeLog6
-rw-r--r--media-video/ffmpeg/ffmpeg-0.6.ebuild6
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild6
3 files changed, 9 insertions, 9 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 025786ecd49b..f116c3f87e39 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.369 2010/09/17 09:35:56 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.370 2010/09/20 16:48:24 vapier Exp $
+
+ 20 Sep 2010; Mike Frysinger <vapier@gentoo.org> ffmpeg-0.6.ebuild,
+ ffmpeg-9999.ebuild:
+ Drop empty KEYWORDS to keep ekeyword happy.
17 Sep 2010; Christian Faulhammer <fauli@gentoo.org> ffmpeg-0.6.ebuild:
stable x86, security bug 332361
diff --git a/media-video/ffmpeg/ffmpeg-0.6.ebuild b/media-video/ffmpeg/ffmpeg-0.6.ebuild
index 7cbe76fc8685..56b6b5a32e50 100644
--- a/media-video/ffmpeg/ffmpeg-0.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6.ebuild,v 1.9 2010/09/17 09:35:56 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6.ebuild,v 1.10 2010/09/20 16:48:24 vapier Exp $
EAPI=2
SCM=""
@@ -24,9 +24,7 @@ FFMPEG_REVISION="${PV#*_p}"
LICENSE="GPL-3"
SLOT="0"
-if [[ ${PV} == *9999* ]]; then
- KEYWORDS="alpha ~hppa ~ppc ~ppc64 x86"
-else
+if [[ ${PV} != *9999* ]]; then
KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
fi
IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index d2c9e05b4970..203c2aee7bea 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.19 2010/08/10 09:57:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.20 2010/09/20 16:48:24 vapier Exp $
EAPI="2"
@@ -25,9 +25,7 @@ FFMPEG_REVISION="${PV#*_p}"
LICENSE="GPL-3"
SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
- KEYWORDS=""
-else
+if [ "${PV#9999}" = "${PV}" ] ; then
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"