use proper abi_x86 flags for the yasm dep; leave the *-fbsd ones until it has abi_x86 support

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

3 files changed, 13 insertions, 9 deletions

diff --git a/media-libs/libvpx/ChangeLog b/media-libs/libvpx/ChangeLog
index 6235512ac52a..0bc65e46a766 100644
--- a/media-libs/libvpx/ChangeLog
+++ b/media-libs/libvpx/ChangeLog
@@ -1,6 +1,10 @@
 # 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.79 2013/06/25 15:07:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.80 2013/06/25 16:26:41 aballier Exp $
+
+  25 Jun 2013; Alexis Ballier <aballier@gentoo.org> libvpx-9999.ebuild:
+  use proper abi_x86 flags for the yasm dep; leave the *-fbsd ones until it has
+  abi_x86 support
 
   25 Jun 2013; Alexis Ballier <aballier@gentoo.org> libvpx-9999.ebuild:
   Go multilib and add missing yasm dep for amd64-fbsd
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 6b554eb08b90..de20bcf8c1ab 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -17,13 +17,13 @@ EBUILD libvpx-0.9.7.ebuild 2111 SHA256 1e74bf96235dcad7e865ac636231da70e63539715
 EBUILD libvpx-1.0.0-r1.ebuild 2487 SHA256 364dd8ebcb60ba62c42df7228559b34462af6f79b64cc0ac85aa03cb48d0e3d0 SHA512 d75b3fb0e8e3ce6ea20924352e76e1785c60896238080d82af72dfa4fd2c828eebb0c8bf8c0df7058219fe3b5c5f9a0413762dff147c6029d7ef11bbfb355ef2 WHIRLPOOL c3c9af47a5262c14f1a958aa5b4bc2752672a967cc88d405b5585b568c0435d739c4c478bfa6746b42d0dac62d4271bf1c790716c94f73c235a030aa2b328fa0
 EBUILD libvpx-1.0.0.ebuild 2166 SHA256 b95c5c350bb714dd36f74d3aa6ca545446ed26410292894ad2c3a4fab4c33388 SHA512 0ec1f44b77f081b8c83d31c104236009e3d9f179818e5beb1199fd1830d31a848fc40c79694316a9bb9faaf1f57213307410038b9a1d15bcf1cfcd386f700f8e WHIRLPOOL 6a6532fa13842fbb24fc74aac2ffde1c8af8af7b2e5df1b4867df96c030b0e8fec8235e68c12b4ad0f9d8426fe23c2d5b51796ed323ca6de982b315ef9d52eb1
 EBUILD libvpx-1.1.0.ebuild 2530 SHA256 67231b8d32861e18070a1936f62892d9c339a2f91e587b73b984d660a4dae8c3 SHA512 bd43732385d6ceb483bebf0891c2fa2052f9593951578f106e9d412b9caed51e13ee3ac004b664b88990c0115d33737e0d5ee613691e949d4a1ee3c72b72fff1 WHIRLPOOL f43c7f458c14c347529ea67b469a2174f0ee6ef1655e818650f8e46942cc5de307f4f32f6001dd86255f0a1377c3d112d67e94baa3472892d7e9e37119212494
-EBUILD libvpx-9999.ebuild 2654 SHA256 51c68d9fc91286eb67aeb0657f267b20732cf7d9a3202f9351538bb5c90e1cb8 SHA512 5093ba234e0014660bebc407a4468128543d17b621f6c8665bdf17df78aadfd2a0e3caf79e9f23f9e65e417959e9e5a8d6ffac31d31f26a0b6c2f95efee70724 WHIRLPOOL 6ce36d156f021a46ec803b228e906c4422620f44b0dd48a3117d4aee433c48dcd9d1f226532f81af75343eece55e2cd837c8cee92c3c7e2d59f4c743643ad57c
-MISC ChangeLog 11616 SHA256 a25b95bb5a4369056f16ca641bffe05058e72d270e29cfe7fed60df67f182d5c SHA512 c9016b282a0e847b86576140d7edf815cdd36df30b897997457a0f9c553ac706357757432463ddcdb5385a066e7612601fcd823441ef94d2da95bb01e208ef92 WHIRLPOOL c6becad3a3bc3f29c90b99af5e2e21df6c281d27d7ef51988f012b18c2687839b27e1d947e8273aaa52d56940d226c66fb6c842eabf950ebda54eaf66cd967e3
+EBUILD libvpx-9999.ebuild 2666 SHA256 10392d96ae16b5307963ab69dbdf6de9bda4aa981243138bc2e6a979902f20ba SHA512 357bb0061eee7985a81f97f6cac338cdee162fe4c865d3459c3d14508ac0df388bf9db226aaba97f940561376b698930488267582a17361f12c9bda21d280e75 WHIRLPOOL f7dafc897cc2be5f2318d6c6c36cb501679c60a6dde19b4c359914244de170e64d7b70acdb93c4f0868a4e83b49c75fb535f08c267d1cfd2925ab2919f7b10e4
+MISC ChangeLog 11787 SHA256 0d01403c91e27831ff1bbdd806a86ddf569b701963c7ef4cb15f63133cacb0b2 SHA512 287061f3584d2a27fbffc17cb6e20a414d796286f6a32614581faaf1ecbdfe2665c67668ce8930efe9a4d6ac92a44d2d9df04edebf72b661b17a66c446906a0b WHIRLPOOL 98e5d2d28d590adfdc5dc1e11ffe38d55ff42a238d86b631616a8ed595d9f3bcdf665f951006d8732063eff65b61367da6e79517060fc6435de1360c4fab4589
 MISC metadata.xml 695 SHA256 9ce8ec472b7274e76137dcb0ee7881d478281161e56f5efc622b4a5eb85820e1 SHA512 19c4f1736767b4df3a0262d16a48b8c39aea5748ec7d6f87fde0231fcc26edf4b0953ba3d3ca0af226370481538958e1b37af91e4af4e6913d80d661ccaf3959 WHIRLPOOL 8c69f5f37908c5ed1d2c820a115e5a26a00282754424d0deadee1a05ff783ae8e62c08cb68c98030ca3f242a8fff8b475f1174cf7f9be441379956458376cea5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHJshUACgkQvFcC4BYPU0rt7wCgzx7cO3Gdr2gZysCci758Ikyx
-o8wAn3xzhuEGCmYTHthf4npRhxLOpcp9
-=l6oe
+iEYEAREIAAYFAlHJxMIACgkQvFcC4BYPU0pT1gCfYbXefPRJwolTKOV/8vs2iuHj
+tloAoJCPpuVopgCEzwlrs4JXHlCpYj8F
+=LVec
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libvpx/libvpx-9999.ebuild b/media-libs/libvpx/libvpx-9999.ebuild
index 1a50f28fe36a..84cae7ee460c 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.31 2013/06/25 15:07:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-9999.ebuild,v 1.32 2013/06/25 16:26:41 aballier Exp $
 
 EAPI=4
 inherit multilib toolchain-funcs flag-o-matic multilib-minimal
@@ -26,8 +26,8 @@ SLOT="0"
 IUSE="altivec debug doc mmx postproc sse sse2 sse3 ssse3 sse4_1 static-libs +threads"
 
 RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224 )"
-DEPEND="amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
+DEPEND="abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
 	x86-fbsd? ( dev-lang/yasm )
 	amd64-fbsd? ( dev-lang/yasm )
 	doc? (