From: Simon Stelling <blubb@gentoo.org>
Date: Fri, 16 Feb 2007 12:13:28 +0000 (+0000)
Subject: depend on >=portage-2.1.2 on amd64 to make sure the assembler USE flags are unmasked
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e0790ef868ecaee70cbd8c51008dc0bbbef0a51c;p=gentoo.git

depend on >=portage-2.1.2 on amd64 to make sure the assembler USE flags are unmasked
Package-Manager: portage-2.1.2-r9
---

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 33a984351970..1b09d7a82c66 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -36,18 +36,18 @@ EBUILD mplayer-1.0_rc1-r1.ebuild 16371 RMD160 56b3bded2bd3befc12217e10f720657916
 MD5 382390159d7046d162b6efb9e7ee86dc mplayer-1.0_rc1-r1.ebuild 16371
 RMD160 56b3bded2bd3befc12217e10f7206579164d8530 mplayer-1.0_rc1-r1.ebuild 16371
 SHA256 ee82ada04b8833d922c7b2f5d9dec44e079405f2f3cc1c8f27451a12c82e384b mplayer-1.0_rc1-r1.ebuild 16371
-EBUILD mplayer-1.0_rc1-r2.ebuild 16421 RMD160 3da1528571bea21a2e3aee0f7f95cf4e3961ac32 SHA1 9caa30a4b8ffc9c9cd27a437f63aa94dbff976f1 SHA256 519d528dc743690e99cf74d26af95a9ead963b7def6f4e7b467e65a41010e042
-MD5 8579b67401a5d4fd2c355de54bbb0891 mplayer-1.0_rc1-r2.ebuild 16421
-RMD160 3da1528571bea21a2e3aee0f7f95cf4e3961ac32 mplayer-1.0_rc1-r2.ebuild 16421
-SHA256 519d528dc743690e99cf74d26af95a9ead963b7def6f4e7b467e65a41010e042 mplayer-1.0_rc1-r2.ebuild 16421
+EBUILD mplayer-1.0_rc1-r2.ebuild 16303 RMD160 934641992641076c81c8edca8282ba756970d952 SHA1 f8b6feb0fb3e3be1a5a6f4793ad518eb31f24500 SHA256 c8f9181155333fe547d69282dc2ced5f600bd828b9cad211772a96db8ab5d87e
+MD5 28d03944ace069bda71733202a39341b mplayer-1.0_rc1-r2.ebuild 16303
+RMD160 934641992641076c81c8edca8282ba756970d952 mplayer-1.0_rc1-r2.ebuild 16303
+SHA256 c8f9181155333fe547d69282dc2ced5f600bd828b9cad211772a96db8ab5d87e mplayer-1.0_rc1-r2.ebuild 16303
 EBUILD mplayer-1.0_rc1.ebuild 16252 RMD160 ba27b359d588073d5fb08aeb8ae355d7e9a54a58 SHA1 82326953105606b7b802c45e3473303dd05e1508 SHA256 87528c199a11b40baff5e75d6fba5a83499c4bcb7e781fba3910db5423fb3e13
 MD5 3499ce30257f8bb8cc53c5c91ec31025 mplayer-1.0_rc1.ebuild 16252
 RMD160 ba27b359d588073d5fb08aeb8ae355d7e9a54a58 mplayer-1.0_rc1.ebuild 16252
 SHA256 87528c199a11b40baff5e75d6fba5a83499c4bcb7e781fba3910db5423fb3e13 mplayer-1.0_rc1.ebuild 16252
-MISC ChangeLog 81729 RMD160 32144c5903913708a022deead0eadfd7f8e9e470 SHA1 eadd64313313da567c26e0c846a4a7222c53c6f2 SHA256 73624594ee7c286f77a4f4f7a93d66f623e07f8378eb3a967801c8d0544daa82
-MD5 8313e036dd90963672c8f1637cb3d756 ChangeLog 81729
-RMD160 32144c5903913708a022deead0eadfd7f8e9e470 ChangeLog 81729
-SHA256 73624594ee7c286f77a4f4f7a93d66f623e07f8378eb3a967801c8d0544daa82 ChangeLog 81729
+MISC ChangeLog 81893 RMD160 83f21b68ee37a40c3dc581249e8bc2a3019f83fa SHA1 1c001e8900055c84119f10ff4d76a92f84f785b9 SHA256 27dea5e60898a9bfe131596fde1b70b6513c7cf21b00a0d84d6f21caf8b3c308
+MD5 a51904701072f31bca238b97d2b816f1 ChangeLog 81893
+RMD160 83f21b68ee37a40c3dc581249e8bc2a3019f83fa ChangeLog 81893
+SHA256 27dea5e60898a9bfe131596fde1b70b6513c7cf21b00a0d84d6f21caf8b3c308 ChangeLog 81893
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index fe8a925db570..23adc8b489a5 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/transcode
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.162 2007/02/01 03:38:26 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.163 2007/02/16 12:13:28 blubb Exp $
+
+  16 Feb 2007; Simon Stelling <blubb@gentoo.org> transcode-1.0.2-r2.ebuild,
+  transcode-1.0.2-r4.ebuild:
+  depend on >=portage-2.1.2 on amd64 to make sure the assembler USE flags are
+  unmasked
 
 *transcode-1.0.2-r4 (01 Feb 2007)
 
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index e07a4094e413..0d57eeb18541 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -24,22 +24,22 @@ RMD160 70efafc9b2b4a39c75b9aed1c0bd4369bfb0332f files/transcode-1.0.2-new-ffmpeg
 SHA256 7b0b59c766e173bb4754c37b52193063a0a84f40ae18c03dc557b4f8aa4133d5 files/transcode-1.0.2-new-ffmpeg 622
 DIST transcode-1.0.2.tar.gz 2347861 RMD160 5a07777093b3d395180396a662dc765c179cd687 SHA1 831a55a0218913e43261eb614ccca34a0d1b3d0d SHA256 765936b908fb32ea2149f76246fb22c931549485959cea76ac40f10924c0c0da
 DIST transcode-types.patch.bz2 5021 RMD160 956ea116495a57e304ab71a20ccd45ffd7416544 SHA1 80df51dddca665cdb3723f56679091076c4717d3 SHA256 02bf6ac9a2e039336e103d43acbe7c86975bc3b587dc9dfa23992bd949fc2170
-EBUILD transcode-1.0.2-r2.ebuild 4027 RMD160 9e907a330ccaaae8f8239e8cebcc614dddea1560 SHA1 411c0f56c6eafa387e01b80acd34a88f9c21944f SHA256 6f7d72e8db3c2eb5d3cb6cab84556733c31a605c37241a3361340936b8413146
-MD5 5f575e026e83f59f965f5c741383e082 transcode-1.0.2-r2.ebuild 4027
-RMD160 9e907a330ccaaae8f8239e8cebcc614dddea1560 transcode-1.0.2-r2.ebuild 4027
-SHA256 6f7d72e8db3c2eb5d3cb6cab84556733c31a605c37241a3361340936b8413146 transcode-1.0.2-r2.ebuild 4027
+EBUILD transcode-1.0.2-r2.ebuild 4027 RMD160 fefbd61f4ca0d8af938784588a3d43c8763e0c0a SHA1 27bf43c2558a1673a408657f7abec129b0cd0c70 SHA256 1cd81e4bfc3b186dd76b30e73114aa600f461b22a8a25ad80ed1b6d735f98d16
+MD5 fb933525543263334a24405cf0632bdc transcode-1.0.2-r2.ebuild 4027
+RMD160 fefbd61f4ca0d8af938784588a3d43c8763e0c0a transcode-1.0.2-r2.ebuild 4027
+SHA256 1cd81e4bfc3b186dd76b30e73114aa600f461b22a8a25ad80ed1b6d735f98d16 transcode-1.0.2-r2.ebuild 4027
 EBUILD transcode-1.0.2-r3.ebuild 4243 RMD160 885e4b3c7291db01f68833b6e043b89a29e6eb78 SHA1 59c1e8cedd68f0043ab3d8b3f596bf74e960fe95 SHA256 1fec515c66d30a608662ae38f3a1a776ab6b69c9bc4ad4eef1d7e69c65d44071
 MD5 cb1f740f16e4fd98833679d6dda5e11b transcode-1.0.2-r3.ebuild 4243
 RMD160 885e4b3c7291db01f68833b6e043b89a29e6eb78 transcode-1.0.2-r3.ebuild 4243
 SHA256 1fec515c66d30a608662ae38f3a1a776ab6b69c9bc4ad4eef1d7e69c65d44071 transcode-1.0.2-r3.ebuild 4243
-EBUILD transcode-1.0.2-r4.ebuild 4297 RMD160 e6d55c27b7b612c2c3568c9240d944bbd0f30450 SHA1 5f667cb0ebd2d7b7fcd44c67cce13679776dcf6b SHA256 1351a9a373d097a1c9e0463db79a33f4b24bdc475ebd4b6369e696b90c1801f5
-MD5 5f8c157865c2bd2ecb0636d2336fee78 transcode-1.0.2-r4.ebuild 4297
-RMD160 e6d55c27b7b612c2c3568c9240d944bbd0f30450 transcode-1.0.2-r4.ebuild 4297
-SHA256 1351a9a373d097a1c9e0463db79a33f4b24bdc475ebd4b6369e696b90c1801f5 transcode-1.0.2-r4.ebuild 4297
-MISC ChangeLog 29094 RMD160 5f018f0cd5ea9a8ec59ab55040e25e6b47538329 SHA1 27da96ec516053f0172bc31fd41cd6c370b1105c SHA256 1203e9a25d9bd45ac12c05226b5897ec4cf2ef3227176f6676d3866900df5f92
-MD5 a080e67d84c51ad2dd08c0af58aa4be9 ChangeLog 29094
-RMD160 5f018f0cd5ea9a8ec59ab55040e25e6b47538329 ChangeLog 29094
-SHA256 1203e9a25d9bd45ac12c05226b5897ec4cf2ef3227176f6676d3866900df5f92 ChangeLog 29094
+EBUILD transcode-1.0.2-r4.ebuild 4295 RMD160 eb9c5df1db1755dcda408428dfa4a415870919d4 SHA1 7bf5dce4f881e95bd285df7dde04d789249fc0bf SHA256 78533bb3f0723822bcd758164dc4b348bd6a9f8ef4dc6f01003951a729473577
+MD5 91aa50da929f8c3c167a98175c97c626 transcode-1.0.2-r4.ebuild 4295
+RMD160 eb9c5df1db1755dcda408428dfa4a415870919d4 transcode-1.0.2-r4.ebuild 4295
+SHA256 78533bb3f0723822bcd758164dc4b348bd6a9f8ef4dc6f01003951a729473577 transcode-1.0.2-r4.ebuild 4295
+MISC ChangeLog 29287 RMD160 bbaf7b1339308328aebfde6cb5475afb085ff8d8 SHA1 e2bdc7f496a9d866f2a9e8e7bde75a618dd02aea SHA256 4e37c269795051345d28433187591c39e597682cdc7f5fbc1d8bb20e100644cb
+MD5 ada9780ae676ebc1048fa441b8de9cc0 ChangeLog 29287
+RMD160 bbaf7b1339308328aebfde6cb5475afb085ff8d8 ChangeLog 29287
+SHA256 4e37c269795051345d28433187591c39e597682cdc7f5fbc1d8bb20e100644cb ChangeLog 29287
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
diff --git a/media-video/transcode/transcode-1.0.2-r2.ebuild b/media-video/transcode/transcode-1.0.2-r2.ebuild
index 006d93ab08c4..fc9f52fb1572 100644
--- a/media-video/transcode/transcode-1.0.2-r2.ebuild
+++ b/media-video/transcode/transcode-1.0.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.2-r2.ebuild,v 1.16 2006/10/01 17:53:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.2-r2.ebuild,v 1.17 2007/02/16 12:13:28 blubb Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -51,6 +51,9 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
 
 DEPEND="${RDEPEND}
 	v4l2? ( >=sys-kernel/linux-headers-2.6.11 )"
+# Make sure the assembler USE flags are unmasked on amd64
+# Remove this once default-linux/amd64/2006.1 is deprecated
+DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
 
 pkg_setup() {
 	if use X && has_version '<x11-base/xorg-x11-7.0' && ! built_with_use x11-base/xorg-x11 xv; then
@@ -83,16 +86,10 @@ src_compile() {
 	use xvid \
 		&& myconf="${myconf} --with-default-xvid=xvid4"
 
-	# Hardenable SIMD extensions on amd64
-	if use amd64; then
-		myconf="${myconf} --enable-mmx --enable-3dnow \
-				--enable-sse --enable-sse2"
-	elif use x86; then
-		myconf="${myconf} $(use_enable mmx) \
-				$(use_enable 3dnow) \
-				$(use_enable sse) \
-				$(use_enable sse2)"
-	fi
+	myconf="${myconf} $(use_enable mmx) \
+			$(use_enable 3dnow) \
+			$(use_enable sse) \
+			$(use_enable sse2)"
 
 	append-flags -DDCT_YUV_PRECISION=1
 	econf \
diff --git a/media-video/transcode/transcode-1.0.2-r4.ebuild b/media-video/transcode/transcode-1.0.2-r4.ebuild
index 4680f7866267..34ef626d7b6a 100644
--- a/media-video/transcode/transcode-1.0.2-r4.ebuild
+++ b/media-video/transcode/transcode-1.0.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.2-r4.ebuild,v 1.1 2007/02/01 03:38:26 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.2-r4.ebuild,v 1.2 2007/02/16 12:13:28 blubb Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -50,6 +50,9 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
 
 DEPEND="${RDEPEND}
 	v4l2? ( >=sys-kernel/linux-headers-2.6.11 )"
+# Make sure the assembler USE flags are unmasked on amd64
+# Remove this once default-linux/amd64/2006.1 is deprecated
+DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
 
 pkg_setup() {
 	if use X && has_version '<x11-base/xorg-x11-7.0' && ! built_with_use x11-base/xorg-x11 xv; then
@@ -91,16 +94,9 @@ src_compile() {
 	use xvid \
 		&& myconf="${myconf} --with-default-xvid=xvid4"
 
-	# Hardenable SIMD extensions on amd64
-	if use amd64; then
-		myconf="${myconf} --enable-mmx \
-				--enable-sse --enable-sse2"
-	elif use x86; then
-		myconf="${myconf} $(use_enable mmx) \
-				$(use_enable sse) \
-				$(use_enable sse2)"
-	fi
-	myconf="${myconf} $(use_enable 3dnow)"
+	myconf="${myconf} $(use_enable mmx) \
+			$(use_enable sse) \
+			$(use_enable sse2) $(use_enable 3dnow)"
 
 	append-flags -DDCT_YUV_PRECISION=1
 	econf \