sci-libs/fftw: Fix blocker of incompatible emul package versions, thanks mgorny

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 15 insertions, 11 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 8a606ee083a6..b1f08bc26203 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.140 2013/04/17 06:26:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.141 2013/05/01 13:33:43 jlec Exp $
+
+  01 May 2013; Justin Lecher <jlec@gentoo.org> fftw-3.3.3-r1.ebuild,
+  fftw-3.3.3-r2.ebuild:
+  Fix blocker of incompatible emul package versions, thanks mgorny
 
   17 Apr 2013; Justin Lecher <jlec@gentoo.org> fftw-2.1.5-r8.ebuild,
   +files/fftw-2.1.5-texinfo5.1.patch:
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 46591aed6c09..dabf0dd516dd 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -14,15 +14,15 @@ DIST fftw-3.3.3.tar.gz 3920661 SHA256 85cdfc0a0ba10d8fa4f0f8e733aac1a5936c859832
 EBUILD fftw-2.1.5-r8.ebuild 3915 SHA256 b04acc5e58e024ef9d35f8da85fcd88c1de9b94a27418e9c385834279c050a94 SHA512 6f2fbbac44dc5c9e7ffa65150fa2b6951db7c772180113933fb684609b8bd42ddbe9d2ac0029424818a0b3f11c0599dd4b24fa00b4873d87f948f3a1c796eea6 WHIRLPOOL aa5092b9eb99f973ff7b033e6fd3e1e9637434b86ebaf229e12e732ca630c0f9f6be96074be2764c26d487c919e3db91a1341ead448b9c8be48cfce22c6840b0
 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 669739ea834c513331d96ea62869403d957bdfb5f8695a17446e44ceb2b23ea2 SHA512 94869e858b52b0b26a9509c36287bb279d74ebcedb0f951c3f8499fba8536173bed1ef4a7018ae0974ab48cdcbbd00a65c2ae2dd1bfa0002cb642105136ad566 WHIRLPOOL 2c1bee0cd282aecd1674951798a93560ea4bc4d3aefb1f36bd345de289d1b88ddf1455cf7ec6ae05986f87cd6b618dd9e1f0cf5c48f90728f43b4741cdb4f967
-EBUILD fftw-3.3.3-r2.ebuild 3849 SHA256 ab26323cb832e924715ac44badc0c965280a4cbb9282f848be54a9a04ca4d499 SHA512 ea75f9ec4c93bf40261773f22aaa1419317377c5c071928d035704c6cc3ed6e99d9ebcbbe31dbc30ccccd946df8516e8916e94526293de080b88dbeaa932b992 WHIRLPOOL 039a6537e3d9dfe2a63c7ae76029a4dd560e84eaef6f346da253db0f271f6502f24b2ccb5ca480c00b89744b8da87bf45ac058e1e4f2e1339e8eb46cb94cabbf
+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.ebuild 3664 SHA256 65d9c22b3331103b7c6358db69f3e51109825c300f2e06c90578f0730849cfe2 SHA512 485a5ce72f155dcb62573329a226a3911ad4efa5874be6f255bd4e5acb2ce8390843722fa3b31bc14d4ad65cd54befe808e08f541b7beccb55a80c54f4e46eb3 WHIRLPOOL bf527e6bf93fb876a48b468e93fa54e436f4c2e452af784e103589c0a707f8261f92f5f1519996d301f89e69a488f54ad0675be61ac83ff2997d815353e0b994
-MISC ChangeLog 25581 SHA256 b81fb65963f76294c39541bc70e5e8928017492da63293105241e7f41136d2c7 SHA512 7bc3a75d8c5c0acbd9b7c5e6e0888d884e6f8ccccb8ceb7230ed3ee7bdad7e2e8867dd86bd629b81c8ad8ce17add04e641262249d358eff269de29e796f6f38a WHIRLPOOL ba921158a6125b68171a6e56de07fdf4af4b143b11bd225906c0e7a8f65002e16fe5a899d3587d1503af1cfd7d59b86534457ca749139d6346bc1f58764df399
+MISC ChangeLog 25742 SHA256 4f1d5d893529ee6eb72659ff61593ce92502edb955fd672adb70d988c10d3ba8 SHA512 2b6ed8b624b35ae0aec93b881570598809dc7dfafb08445e56ebdc46569384c49062dbf546487b6285bd728d0a321f1cda2a1ab0579cac8a45d0a2f3e8d51a23 WHIRLPOOL 0a5260943853dcb8f0fffbb1ae0f1ec59f904eca1b75621d7ff68787ac28a121df3451e9e43d8147302e38b75f9d39d82df8984f063656ebf1917404ab3d37be
 MISC metadata.xml 1243 SHA256 34a8bc5356ea410cdd708b2ef4f5e57a53be0f1d6af7c54ae72f57d65f4caae2 SHA512 b790a83e5bd8451b7e5efaa8c7430dc0c879a4be30f913f484572cf8c3b6199b283483df51d0234e0d6b99d324e9bade7e03f84254058225b592a74a90e5eddf WHIRLPOOL 4fa9379a2d144d25c1d60dd0370e02b4207be3d0327d4b849a4c8ab651f3986dc36b463451007611f1d0af83084833a71f98c672b369bca2dff0823ebe15a3f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlFuQI4ACgkQgAnW8HDreRa++wCgvtVYaw9aZMxUAG7NO08EbLLK
-WpYAn21lXabjZvQDccji+r+30CBfaH1h
-=Wxeh
+iEYEAREKAAYFAlGBGbgACgkQgAnW8HDreRYpUACcDVr8V6paYbrc2w57l18jM1cj
+iXEAn0oqnSm5JoJ0PbTvIIjlvFyO5vk/
+=A6Un
 -----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 df2831175c2a..fe270f6d74ac 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.3 2013/03/10 18:47:22 jlec Exp $
+# $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 $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ 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-20121202 )"
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )"
 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 975d7333d8c1..25b71b98ba07 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.1 2013/03/10 18:47:22 jlec Exp $
+# $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 $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi !quad ) )"
 
 RDEPEND="
 	mpi? ( virtual/mpi )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20121202 )"
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )"
 DEPEND="${RDEPEND}
 	test? ( dev-lang/perl )"