x86 stable per bug 378801

Package-Manager: portage-2.1.10.10/cvs/Linux i686

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 9c0b68db6d81b0bc59518ee95434d0dec9261c36..61ae8867afca3fc814491ea9e16c09914fd35263 100644 (file)
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.440 2011/08/18 10:18:29 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.441 2011/08/19 15:55:04 tomka Exp $
+
+  19 Aug 2011; Thomas Kahle <tomka@gentoo.org> ffmpeg-0.7.3.ebuild:
+  x86 stable per bug 378801
 
   18 Aug 2011; Tony Vroon <chainsaw@gentoo.org> ffmpeg-0.7.3.ebuild:
   Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo in

diff --git a/media-video/ffmpeg/ffmpeg-0.7.3.ebuild b/media-video/ffmpeg/ffmpeg-0.7.3.ebuild
index 96f2e24f3b2d19ab1eea1525782026e51948fd4f..ff6e0cc603dd11b0964303d81112d67f03ef1fcb 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-0.7.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7.3.ebuild,v 1.4 2011/08/18 16:06:57 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7.3.ebuild,v 1.5 2011/08/19 15:55:04 tomka Exp $
 
 EAPI="2"
 
@@ -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 ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+       KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 fi
 IUSE="
        +3dnow +3dnowext aac alsa altivec amr avx bindist +bzip2 celt cpudetection

diff --git a/media-video/x264-encoder/ChangeLog b/media-video/x264-encoder/ChangeLog
index 3c758af06ce7563feefdd32ef902b5eb654099df..63b96dd048017db99b5f22eed5d2ad0c61d59348 100644 (file)
--- a/media-video/x264-encoder/ChangeLog
+++ b/media-video/x264-encoder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/x264-encoder
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.50 2011/05/28 12:04:21 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.51 2011/08/19 15:57:32 tomka Exp $
+
+  19 Aug 2011; Thomas Kahle <tomka@gentoo.org>
+  x264-encoder-0.0.20110426.ebuild:
+  x86 stable per bug 378801
 
 *x264-encoder-9999 (28 May 2011)
 

diff --git a/media-video/x264-encoder/x264-encoder-0.0.20110426.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20110426.ebuild
index ff1e23fe9d3eda0809516d6172098048a0ae314c..55d4732cd4772b9074cdd0a0c1835a82f6ee8361 100644 (file)
--- a/media-video/x264-encoder/x264-encoder-0.0.20110426.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20110426.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20110426.ebuild,v 1.1 2011/04/27 17:20:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20110426.ebuild,v 1.2 2011/08/19 15:57:32 tomka Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs versionator
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="debug ffmpeg +mp4 +threads"
 
 RDEPEND="mp4? ( >=media-video/gpac-0.4.1_pre20060122 )