arm stable, fix some arm-related stuff

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

6 files changed, 20 insertions, 11 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 211d3b264883..16b9b3930da1 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.278 2009/03/11 23:11:39 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.279 2009/03/31 19:28:15 armin76 Exp $
+
+  31 Mar 2009; Raúl Porcel <armin76@gentoo.org>
+  ffmpeg-0.4.9_p20090201.ebuild, ffmpeg-0.4.9_p20090201-r1.ebuild,
+  ffmpeg-0.5-r1.ebuild, ffmpeg-9999.ebuild:
+  arm stable, fix some arm-related stuff
 
   11 Mar 2009; Steve Dibb <beandog@gentoo.org> metadata.xml,
   ffmpeg-0.5-r1.ebuild, ffmpeg-9999.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index c3912c858089..e874f05d1028 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -8,9 +8,9 @@ DIST ffmpeg-0.5.tar.bz2 2744768 RMD160 23b4a591c422f98b634eba0ba82817ad27a4ff07
 EBUILD ffmpeg-0.4.9_p20081014.ebuild 6400 RMD160 ece41c320da3ab98bbd93dcab604c67e2e31aea5 SHA1 e8517457d731a9821efd87930782e8ca38aa6133 SHA256 0e3119b7f1a8edf9b7fd544708989f7438431652a81f0ed5b087f3fc5368f9e6
 EBUILD ffmpeg-0.4.9_p20081219.ebuild 6146 RMD160 d9ace186852d82930fb988e5ef265f3a8bf58e85 SHA1 f12fa4e3326ed25c4d12078792e3b5a325ca420b SHA256 570e02a5a98db588cf56cbf3e51078cc5ae266ee961a53d7fe7748b411549bb4
 EBUILD ffmpeg-0.4.9_p20090121.ebuild 6151 RMD160 af9848d2992e88c99a9b907542e95c5ee571f638 SHA1 b3f5d2e73a78f6c647e9096d8d3c7c23eb95fff2 SHA256 2ca908b5a71741b347aea0e7c44f74e24356b691f3c13705ff957580d3230c37
-EBUILD ffmpeg-0.4.9_p20090201-r1.ebuild 6253 RMD160 e8a26996c720d2b8483c487b58f29563dd468cf8 SHA1 e1796504e4586151d5df63a727c5a9e231a3404e SHA256 a15df64fc68af3838e927794b9536f355900c5430900f86d410ef9d75a86b64f
-EBUILD ffmpeg-0.4.9_p20090201.ebuild 6273 RMD160 d78b233e4b285c2f452396c84827126c9eb5dbb6 SHA1 a330052ed12fb8ca0cb1e30557d08719c9f012b6 SHA256 9ae1b2798eab76507447ebe785d97f3752ebf8fde9bc89866817b45d47efbb1f
-EBUILD ffmpeg-0.5-r1.ebuild 6143 RMD160 1a45c752573bc8dcd4c3f7b110d0eff9e9b75f2e SHA1 e85a4ff9b7ec04d0233721f120422d24d8aa5b25 SHA256 cc87ea24ce5544a22ac5d4b6b1fc441a105d111574aa4152c718c68ed92bdb53
-EBUILD ffmpeg-9999.ebuild 6040 RMD160 fb7666d6767ca4836f15e603f6216c038ef67622 SHA1 0884e32c94f36ad1153f9b72939bc91f909a581d SHA256 c28561671b9ec4208f435576a3c61e1c05e26cc030227657abf7c654c920290a
-MISC ChangeLog 42299 RMD160 c498d2b1faf4a81b2f563ac6ccf7853dfe1428db SHA1 e2780f17244ddd85643553fb92a60914c7b21bdd SHA256 61a3970a9407afeaa8b2b1486b25d2cfcfa6253a6e569a9ee3f840dd842cf7f9
+EBUILD ffmpeg-0.4.9_p20090201-r1.ebuild 6308 RMD160 4f31d29701c82e4acfcb41ff549a30edaf341aff SHA1 4198f31ef513fd07afe97eec186532b83afc6e08 SHA256 eaa633b8e72d2204a25a31ead8e4f3c021da278af6dd9ef516bc8bf58afc8d99
+EBUILD ffmpeg-0.4.9_p20090201.ebuild 6324 RMD160 ae992ea5e0a11e364fbd195627f89ed725d53c20 SHA1 6481b08d3fc38dd57f1978ca4095ea767cd65751 SHA256 1a814a9d6d1d189a6ceb687411a01702d3323a3512763b216d1aa93b923f34f5
+EBUILD ffmpeg-0.5-r1.ebuild 6198 RMD160 6b0eec3cd089e1e35796a101596f641eb4070cbb SHA1 621f74ca30352d3e4acac6f69065cef99f35cc30 SHA256 92ebd33bad0583b6f009e9367519381ea42df7b628d927129d3740b91ce599c7
+EBUILD ffmpeg-9999.ebuild 6095 RMD160 2cb95a05017e50d65412396d4570e4256a0a4c11 SHA1 b4ed1efa4320ab4f271e0f45148e4f56a85dc7e5 SHA256 afabdbaaebd6cdf870f587f91361973ba557e7aebb29606ae911ea116b54fb7e
+MISC ChangeLog 42501 RMD160 f47e0e34f6911600201a6846191c8a4b474b4662 SHA1 6421697d215ecc276bbfedce63d0980e10b31d8e SHA256 141364227cf79dfd85fc85c40ec613285711991e949690258873a6a1fe682524
 MISC metadata.xml 1573 RMD160 befd4c2d30f834fda711f150843aebcc6f027b57 SHA1 a5128622bfb5d2c1bdc44e1542a2a09664516193 SHA256 7c1a4821aa99606ae3c52df66cf3a3fa8d32d94cfc0e07d346b203e6966a1183
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20090201-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20090201-r1.ebuild
index 7318b8918def..065ab645c64d 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20090201-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20090201-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20090201-r1.ebuild,v 1.1 2009/02/21 23:30:55 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20090201-r1.ebuild,v 1.2 2009/03/31 19:28:15 armin76 Exp $
 
 EAPI=1
 
@@ -77,6 +77,7 @@ src_compile() {
 	fi
 
 	use custom-cflags && myconf="${myconf} --disable-optimizations"
+	use arm && myconf="--disable-armv5te --disable-armv6"
 
 	# enabled by default
 	if use encode
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20090201.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20090201.ebuild
index 701ad02c777f..805795a3a612 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20090201.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20090201.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20090201.ebuild,v 1.8 2009/02/11 17:07:42 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20090201.ebuild,v 1.9 2009/03/31 19:28:15 armin76 Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -16,7 +16,7 @@ S=${WORKDIR}/ffmpeg
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="3dnow aac alsa altivec amr debug dirac doc ieee1394 encode gsm ipv6 mmx mmxext vorbis
 	  test theora threads x264 xvid network zlib sdl X mp3 oss schroedinger
 	  hardcoded-tables bindist v4l v4l2 speex ssse3 vhook"
@@ -77,6 +77,7 @@ src_compile() {
 	fi
 
 	myconf="${myconf} --disable-optimizations"
+	use arm && myconf="--disable-armv5te --disable-armv6"
 
 	# disabled by default
 	if use encode
diff --git a/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
index 47c1325ed3cd..34b6c358fef2 100644
--- a/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild,v 1.2 2009/03/11 23:11:39 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild,v 1.3 2009/03/31 19:28:16 armin76 Exp $
 
 EAPI=1
 
@@ -64,6 +64,7 @@ src_compile() {
 	fi
 
 	use custom-cflags && myconf="${myconf} --disable-optimizations"
+	use arm && myconf="--disable-armv5te --disable-armv6"
 
 	# enabled by default
 	if use encode
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 285daed798ad..7f77f71409b8 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.12 2009/03/11 23:11:39 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.13 2009/03/31 19:28:15 armin76 Exp $
 
 EAPI=1
 
@@ -64,6 +64,7 @@ src_compile() {
 	fi
 
 	use custom-cflags && myconf="${myconf} --disable-optimizations"
+	use arm && myconf="--disable-armv5te --disable-armv6"
 
 	# enabled by default
 	if use encode