fix emul-linux blocker

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

4 files changed, 19 insertions, 13 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index abc168a551ab..b0d634e79121 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/fftw
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.142 2013/05/03 14:19:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.143 2013/06/27 14:30:29 aballier Exp $
+
+  27 Jun 2013; Alexis Ballier <aballier@gentoo.org> fftw-3.3.3-r1.ebuild,
+  fftw-3.3.3-r2.ebuild:
+  fix emul-linux blocker
 
   03 May 2013; Justin Lecher <jlec@gentoo.org> fftw-2.1.5-r8.ebuild:
   Fix obsolete macros to work with automake-1.13, #468456
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index e44041e8869d..95f72c164e34 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX fftw-2.1.5-as-needed.patch 4374 SHA256 b1d65b2dca62257db5c78e81577fb87b7d79f6eb75b8899de48faabfc702e9f0 SHA512 b460d3d3fcc8ea325ef9fc6aa29d0d4f0274697c55b8986d4219531234f89037c814e178144524b5bc6e4a30adf64e1cb30a25ebf042358510485b151c31d049 WHIRLPOOL 6ad4e5676285c8ac17feeaf91980a8bf1116aa70d59e96db319b6beb53579cc6506c684c4c09da482b5307fd634e4d6e449bc1ad59186ead559793d481c23745
 AUX fftw-2.1.5-cc.patch 546 SHA256 52b2ba8a140e46e9a1f1c71d8e85faaac70e6d783ba8e45f4423ba6f70f04dbe SHA512 f21ba12ec727a023d41df95b24d03273d416888b21f56dde8d2a256d15b9543a091a02f7100e86196bb7a38492d470b58ab293fed58a21e2417e2427f786368a WHIRLPOOL a333539e1bf7feee517818f9c9c7375d1c71a7792aa1662d18ba6727ab517c444a68375c0e1210f736f0e9dcd297f3ab64273777f5064afe3b724985dff4a641
@@ -14,15 +14,15 @@ DIST fftw-3.3.3.tar.gz 3920661 SHA256 85cdfc0a0ba10d8fa4f0f8e733aac1a5936c859832
 EBUILD fftw-2.1.5-r8.ebuild 3985 SHA256 cbb0c89c800ba8e33de782e4dbaa4870ac731f4d4a9ed7da677e693493112385 SHA512 f1a9a027d3e6408f8e45b885e4909dcb82356a574be8faebf719f87f51ed85693dd3bc3eefafd92c9fd6066e4d75be59bf55b14b360a7053564c47c9fafe28f4 WHIRLPOOL aeb2fda6ea435b4fd25fef07923f23964244f311437efba1bde49806ee83461d9db6ea913c79fb345e3102b0fd60be6ba3035ab84e21ae608509291d39e410e7
 EBUILD fftw-3.2.2-r2.ebuild 3860 SHA256 23a82110c30d422195befeab7463f6a4e226bd3233f9d96ef13fca2f11ce315a SHA512 3b029a451fb15bec245e7813d41f0ce49aaf7345ba9df820c4a0c7e77faa0b0099fcbeb14129685f59d0496639c05754206de94d7acff1fea933f16a3782cc00 WHIRLPOOL 6479e46b5740f6522896e5e3fcbeacd8bdf6fb3a5b0bb105af77bc0239e6e90a68bf05dca1c02562bfc750ebb775414654329342328c7e527ccc46db1bcbe0cc
 EBUILD fftw-3.2.2.ebuild 3652 SHA256 7be4b3e229e3a3b226d37ac76601c4a1ed38da4846565ff445d4aabfb3496f08 SHA512 862fc6ce08819ba8ec3967c5eda63fb84bc8990d319e481aac7d80bd50f4bd1ed70eec227b368dc3ea5e4a1eda865db5f107118561eb8c37c275f9c9b39f7404 WHIRLPOOL 80d8d2e9f86ffe5d7b7bad06fe559efcaeb510359936a01cc0f1e8e1077193fdd756a137ad85f22ee3dec6ee95ffe0e58c588e87fe388682f0bc8024d6e7e535
-EBUILD fftw-3.3.3-r1.ebuild 3974 SHA256 c05157efc1c6dcb60aec2ddc60e7466099c5bceb7bf1e01c3043012a70b44e94 SHA512 bfccdab04c5cdf842269f716fddf7c1285a8504001713c32bbd8c8687008e797a7cab04b44220fa0770fce29a789a30e8f56f780f4ae9068a8d16b29d35ad14a WHIRLPOOL bd5660266b6fc640fde87814acb5f2fa7a23e62e4a88e056806db0a3d1aa4e70f024b2e7849c4accc799d8aac001355f1c8a812f5745e3ae1089fc781a419e25
-EBUILD fftw-3.3.3-r2.ebuild 3849 SHA256 4933df6d11560d89cd104b47be88f01c80ba8fb197d3b657f8a94fe1f72547e9 SHA512 ec9834fa9ba3bb4026622ad68d91ca5d77057549023ebf3434d056b90157c48017f8118cb905361b63f18cfe7a2d806fdcd6325aae04163207443562f12f3aba WHIRLPOOL 5fb3225eb1ad9e7572df0da39d04968631ae7fbf14d3f515052a57afa9e867f3b50b0cf90c66e8cf6af4f3e5113560a677de061a6060f4da6e1174c5ab9719d0
+EBUILD fftw-3.3.3-r1.ebuild 4042 SHA256 e6ef2d1170fd01abf42bda4a764cf6110f1397f86441419832c1ec74695b33db SHA512 be412ee4b94b5cdf116356903003d4193967998a65a60298b4aa679c46e6dce12ed79241f32e331862ddcbf4f20005095c041bdd6691024a3ab96e43c4ed5a52 WHIRLPOOL 6f9dc16986da644156ebcc9ebc64027c24b78e8af592c1128df8408ba32a24020794ae8628a0e7a62957b2782ea024d876f92e25757383affd172e18581cb345
+EBUILD fftw-3.3.3-r2.ebuild 3917 SHA256 6014dc96595d0fd1265139cc3d901d796be62ca47842ecf1d787f6638ea9bd0b SHA512 67ba3d2fb009e50195657df64370cf95ef1db4aa64a034cad23f42e5136b77be1a3e840fa0c7849fb68daaf93e529bfd26c79b0afd6b1f9c6994f4712d54a463 WHIRLPOOL b95950b2f5cca05ca7225cca070e12c196da5571695457d86db8350fdc195c7710b6d97c1789231c23074a3d33e09b6322663e51b00273cc896fa31cb67e2c29
 EBUILD fftw-3.3.3.ebuild 3664 SHA256 65d9c22b3331103b7c6358db69f3e51109825c300f2e06c90578f0730849cfe2 SHA512 485a5ce72f155dcb62573329a226a3911ad4efa5874be6f255bd4e5acb2ce8390843722fa3b31bc14d4ad65cd54befe808e08f541b7beccb55a80c54f4e46eb3 WHIRLPOOL bf527e6bf93fb876a48b468e93fa54e436f4c2e452af784e103589c0a707f8261f92f5f1519996d301f89e69a488f54ad0675be61ac83ff2997d815353e0b994
-MISC ChangeLog 25870 SHA256 13444cc2f91867b6e772048fe4a41f82b5786a848ba71c93051ab455e4706297 SHA512 d9cb1a91f22caf1d3e17974db321ea7f90152b12015d65fb67c2ae980031e7d9a32165570f15467c342644d3cc429f70e394abe36c4f14a4fef94d930e117348 WHIRLPOOL b5cdc9d6978cee26686db1bd4f08e3f4545b081f0e16824c7af2fda4550d282a1c9f5ed1e3a58f7a0c2c451b2fc2385adb2165ab3dfc179e0c9ea062004d3cb6
+MISC ChangeLog 25998 SHA256 140bfde300662f7d8e1372034d3d8436a7ba62b7e150f92e859e020297b45957 SHA512 6b7b0a655c11131d0d28b0e6144b188fa3c5c642cb0dcd77a47cc0b8edc85a67398c635b3b063bbb735bdea12aa50858b2399670180c294b05f15cd00b14344b WHIRLPOOL 7540d5ed1658ac3517f701fd727abac9d8587e38ff71a6afb5f9420bb525b215e95ad03c1350d97df5a51ed2ff840e3402cd1f86db4a393397afa2bce722c3e2
 MISC metadata.xml 1243 SHA256 34a8bc5356ea410cdd708b2ef4f5e57a53be0f1d6af7c54ae72f57d65f4caae2 SHA512 b790a83e5bd8451b7e5efaa8c7430dc0c879a4be30f913f484572cf8c3b6199b283483df51d0234e0d6b99d324e9bade7e03f84254058225b592a74a90e5eddf WHIRLPOOL 4fa9379a2d144d25c1d60dd0370e02b4207be3d0327d4b849a4c8ab651f3986dc36b463451007611f1d0af83084833a71f98c672b369bca2dff0823ebe15a3f7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAlGDx2MACgkQgAnW8HDreRbWvQCgtBi+7C+Pt+d+TbYPXbIOIs3T
-36cAnAhq89KrOUI6mAy7jBp6cyoaM3cs
-=97Yr
+iEYEAREIAAYFAlHMTIcACgkQvFcC4BYPU0pVeACgrrTzwghL6fT72hN8YJTL8wmm
+25wAnj28KA8UjhK9d1/W9KZ06K2XS4mz
+=gnqR
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/fftw/fftw-3.3.3-r1.ebuild b/sci-libs/fftw/fftw-3.3.3-r1.ebuild
index fe270f6d74ac..9c192d6e6606 100644
--- a/sci-libs/fftw/fftw-3.3.3-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.3-r1.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/sci-libs/fftw/fftw-3.3.3-r1.ebuild,v 1.4 2013/05/01 13:33:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild,v 1.5 2013/06/27 14:30:29 aballier Exp $
 
 EAPI=5
 
@@ -22,7 +22,8 @@ IUSE="altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs test
 REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi !quad ) )"
 
 RDEPEND="mpi? ( virtual/mpi )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )"
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
 DEPEND="${RDEPEND}
 	test? ( dev-lang/perl )"
 
diff --git a/sci-libs/fftw/fftw-3.3.3-r2.ebuild b/sci-libs/fftw/fftw-3.3.3-r2.ebuild
index 25b71b98ba07..254109334a14 100644
--- a/sci-libs/fftw/fftw-3.3.3-r2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.3-r2.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/sci-libs/fftw/fftw-3.3.3-r2.ebuild,v 1.2 2013/05/01 13:33:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild,v 1.3 2013/06/27 14:30:29 aballier Exp $
 
 EAPI=5
 
@@ -23,7 +23,8 @@ REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi !quad ) )"
 
 RDEPEND="
 	mpi? ( virtual/mpi )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )"
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
 DEPEND="${RDEPEND}
 	test? ( dev-lang/perl )"