set AS to yasm based on CHOST which seems to be the sanest to do, bug #345161

Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 14 insertions, 11 deletions

diff --git a/media-libs/libvpx/ChangeLog b/media-libs/libvpx/ChangeLog
index 9219ce5c417f..83f124352cc7 100644
--- a/media-libs/libvpx/ChangeLog
+++ b/media-libs/libvpx/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libvpx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.81 2013/06/25 16:30:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.82 2013/06/25 16:37:22 aballier Exp $
+
+  25 Jun 2013; Alexis Ballier <aballier@gentoo.org> libvpx-9999.ebuild:
+  set AS to yasm based on CHOST which seems to be the sanest to do, bug #345161
 
   25 Jun 2013; Alexis Ballier <aballier@gentoo.org> -libvpx-0.9.6.ebuild,
   -libvpx-0.9.7.ebuild, -libvpx-0.9.7-r1.ebuild, -libvpx-1.0.0.ebuild,
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index e413799c2dff..7f880fa53a51 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -7,13 +7,13 @@ AUX libvpx-1.1.0-generic-gnu-shared.patch 1466 SHA256 411335557d7b8f04f53c971dc7
 AUX libvpx-1.1.0-x32.patch 1768 SHA256 931c23ed8d45c878943c6c7d9c647295962ab81d4b71a737063da95fd105b45e SHA512 87fa2fe4e7e47df1fe5eabc852937be1d893585b21d0533f80e33fcdacfa45edb66755ff31276d9d42d2922d2cb086c69a0c00c598df52fc171deaf5f5138373 WHIRLPOOL 9dce21ca3d1602c6ecc657eb2aa145c5a2dabfb360107f881a6668b1549194b3c24aab6bb8c6c0d1906f1b51fc6f97860629ebcc2fae175b9555e1606829c2bc
 DIST libvpx-v1.1.0.tar.bz2 1653485 SHA256 9ce074cf4b3bcd9a49ff93e05485b71c273bfc3685a305e55a0e7fa51beb72c5 SHA512 5c165a1a171143f7c406ef899914a353d35f6dec0e3c49eec9a4f3311fd4072dea2e0da8ceb80651ad23e24cdbf2d6da328805bda8be042bbea2c65c9e53eaaa WHIRLPOOL 2dc8164e3f812903a1b52901438857bcdf172cb1d979f1ced45933fc12ffbb0c49e2a6c02b0c6f3360f48b146e1e5c6ea25c1613abafc3089030f6c1e7af92ed
 EBUILD libvpx-1.1.0.ebuild 2530 SHA256 67231b8d32861e18070a1936f62892d9c339a2f91e587b73b984d660a4dae8c3 SHA512 bd43732385d6ceb483bebf0891c2fa2052f9593951578f106e9d412b9caed51e13ee3ac004b664b88990c0115d33737e0d5ee613691e949d4a1ee3c72b72fff1 WHIRLPOOL f43c7f458c14c347529ea67b469a2174f0ee6ef1655e818650f8e46942cc5de307f4f32f6001dd86255f0a1377c3d112d67e94baa3472892d7e9e37119212494
-EBUILD libvpx-9999.ebuild 2666 SHA256 10392d96ae16b5307963ab69dbdf6de9bda4aa981243138bc2e6a979902f20ba SHA512 357bb0061eee7985a81f97f6cac338cdee162fe4c865d3459c3d14508ac0df388bf9db226aaba97f940561376b698930488267582a17361f12c9bda21d280e75 WHIRLPOOL f7dafc897cc2be5f2318d6c6c36cb501679c60a6dde19b4c359914244de170e64d7b70acdb93c4f0868a4e83b49c75fb535f08c267d1cfd2925ab2919f7b10e4
-MISC ChangeLog 12055 SHA256 e408a152649d36cfca14db15644b682d4be00409e776254e8ba106adaf9bbe80 SHA512 4784b3c6bd23b431711db0478201a2a8301430b3a22bfbe42bee75671ae0388131b5b56f629b21139549c87044b65c1ea426009026a83ef933f7cd540c5cb507 WHIRLPOOL 6aaa6db2920579460c51bf3ebaca39463de39f3b3045459573718890777faf31966ecaf8387e5f93dadd5a4fadf09d3ff57e91834e03305142e8dc9595c46dd3
+EBUILD libvpx-9999.ebuild 2665 SHA256 97f2df396ae9d64774550f2cf67e8c54f305e083c56d83baf3948f25a1e24f14 SHA512 ce12552d7a393181599def5697e25f7ae6694568b7449cfb419a08cd26bf3af2e6b039eb8f93d9483852109c6407f3d8b4f9c9ebe513dcfd3a925cf65a63dd06 WHIRLPOOL d531dc290a0d511b37dbba4c134c7bb7c9bd485c767c30666d3355fe3a1ec723004e67b0b865f3f4ea1e994d4af72d3cf2018bccb09422c7f1d31a0e16b74d1d
+MISC ChangeLog 12208 SHA256 4493fc7bee6aa3958205791b66f6536ba09dc2f8afee611254a65bf15007ad55 SHA512 eaf2f0c127dbf321660c18043dbf02cb61a0661e8d86f8e94996609eb26ffab3755eb3d85978f289e34c7915b636f268eb664e7302684c0bead3b3b208fee9b8 WHIRLPOOL 10018f03afac8f9a5baeae0dde4f221f07fbf0d2ec1e2db4350d11c55b323147fd7d26db78d2e721b66aae99f849381cde3ddd52162bb33f0f58490caa3e81c6
 MISC metadata.xml 695 SHA256 9ce8ec472b7274e76137dcb0ee7881d478281161e56f5efc622b4a5eb85820e1 SHA512 19c4f1736767b4df3a0262d16a48b8c39aea5748ec7d6f87fde0231fcc26edf4b0953ba3d3ca0af226370481538958e1b37af91e4af4e6913d80d661ccaf3959 WHIRLPOOL 8c69f5f37908c5ed1d2c820a115e5a26a00282754424d0deadee1a05ff783ae8e62c08cb68c98030ca3f242a8fff8b475f1174cf7f9be441379956458376cea5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHJxZMACgkQvFcC4BYPU0qUgwCffzm3H/6Y/IU9PH+Wk8V0UCnz
-Jw0An0pDq8SNKzgE0H59FHyN+U/uNLE+
-=JoCP
+iEYEAREIAAYFAlHJx0MACgkQvFcC4BYPU0pFJgCggVzQtt4Yr/CWg/gU4M76NMRY
++D8AoKfHoukg+3oRNl/u6pmjtvSaiL0c
+=AshO
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libvpx/libvpx-9999.ebuild b/media-libs/libvpx/libvpx-9999.ebuild
index 84cae7ee460c..a76803399b0f 100644
--- a/media-libs/libvpx/libvpx-9999.ebuild
+++ b/media-libs/libvpx/libvpx-9999.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-libs/libvpx/libvpx-9999.ebuild,v 1.32 2013/06/25 16:26:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-9999.ebuild,v 1.33 2013/06/25 16:37:22 aballier Exp $
 
 EAPI=4
 inherit multilib toolchain-funcs flag-o-matic multilib-minimal
@@ -47,11 +47,11 @@ multilib_src_configure() {
 
 	# let the build system decide which AS to use (it honours $AS but
 	# then feeds it with yasm flags without checking...) #345161
-	local a
 	tc-export AS
-	for a in {amd64,x86}{,-{fbsd,linux}} ; do
-		use ${a} && unset AS
-	done
+	case "${CHOST}" in
+		i?86*) export AS=yasm;;
+		x86_64*) export AS=yasm;;
+	esac
 
 	# build verbose by default
 	MAKEOPTS="${MAKEOPTS} verbose=yes"