add a blocker on emul-linux-soundlibs

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

3 files changed, 13 insertions, 8 deletions

diff --git a/media-libs/libmikmod/ChangeLog b/media-libs/libmikmod/ChangeLog
index 0906b037ee1b..a25b4156ac7a 100644
--- a/media-libs/libmikmod/ChangeLog
+++ b/media-libs/libmikmod/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libmikmod
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.108 2013/06/27 18:11:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.109 2013/06/27 18:20:10 aballier Exp $
+
+  27 Jun 2013; Alexis Ballier <aballier@gentoo.org> libmikmod-3.2.0-r1.ebuild:
+  add a blocker on emul-linux-soundlibs
 
   27 Jun 2013; Alexis Ballier <aballier@gentoo.org> libmikmod-3.2.0-r1.ebuild:
   Add missing MULTILIB_USEDEP on alsa-lib. Add altivec, debug and threads
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index 4ddd61a44b21..9cfe84bec54b 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -12,14 +12,14 @@ AUX 3.2.0/008_all_ldflags.patch 551 SHA256 e26fd5f19f1f867654c93296366a8d554caf7
 AUX 3.2.0/009_all_shell.patch 469 SHA256 09ff28b2329311135d6bb9fac6e9a7ed35d10dea13cdb54d9fc2f1bf5490fa11 SHA512 2c75dd8b972a959114631f8e3372a6f2a9cc2397da0cc64b7e855acc952c940bf757762d16a1c512f083ef58781801dcbe1a9571a6a56c724fb8fa329594aaf9 WHIRLPOOL a8415a6435d4a0a762d787efc46db011f253069aaf34fca5753e2365a9e0eca770c5cae13b94166aae22e36264718c6cfc9b03ed27f2c36b3e85587a7770eef0
 AUX 3.2.0/010_all_altivec.patch 257 SHA256 ebc5902c644f935a4689caf32eb7cdb1f23f6de77d40bfdf3553356592f08fa2 SHA512 3a34e6550d84c45f51170607c8272178a61551e69a8971872a717918c0130d7aa4e5d91a0d8cbc1502d2f97aa06df40fde859de8547828b4a365af776309bd51 WHIRLPOOL b613c109b7b1a9a74d8e3e77a0e8be759eeb93307a04eaaef532bb72df6b650441e5124043e40c6c4f336b6e2b9741792f07db1c0d7ae4620d449ecc28ccea22
 DIST libmikmod-3.2.0.tar.gz 873258 SHA256 734c8490bbf9b0c587920b92414dcfa3c2267838a0cdf698d5f1fb6bba8f661e SHA512 1f48adb4e1540bb9d2ea90c2f1fd1fb2fc494ae2dd0a6bceb20a8f7f7101f37f8c967b0ce36d5e09943d3afe9319f533867d80e5b5552439d300691bee70e33d WHIRLPOOL f7a7aed29026c66abb9e0f2bfb5d703ad5a0cab7bc0454bf5e612ed995808a2d02361eda33c7bbe0e7aaef6aa9ba5f1ed0d6eaf2853a2d6b497c6359043804c3
-EBUILD libmikmod-3.2.0-r1.ebuild 2018 SHA256 29f04ee78d3213cffb2feabe2fa653121968de82aa594e6d2c12ccb7eb3118c9 SHA512 11920b20c35c9710074513d5653f57dfa9b37c7379893cf21c35e9d56be2e21c833afc7a31142d57e8c10473fc7e7970a5b91caf90ac194841e5669ac466f870 WHIRLPOOL 4805048022ff61e8e87ad82d347f1ca5c5d1488f96fe2dbbe8c8acc3c7c66355a60385e2d0155411978f05fce90e0a9e725103de3617e0523b08fb2b4830ffc1
+EBUILD libmikmod-3.2.0-r1.ebuild 2150 SHA256 36b34a9dbf519c92aae6237220cc31e3c7de60ea218db76fa91b7ba7b47a7e83 SHA512 f271e54997a5e1dac23a3eea38122e6505e2e98f8686c67290d90f0441045872d83f3a942dc061bba8a5a2468baab812a3672671e47658b9421f0d24486534b8 WHIRLPOOL 47804783eb2b05e22984fde42cd13c213b7182189c5012119af056a73888dd5cf9978f5579174085eb822e9e1fbc0cd3b2a88532a4aa6c12ae5e5f640535b8be
 EBUILD libmikmod-3.2.0.ebuild 1680 SHA256 c2a99aa1dda88635078d756acfd538d6bd2226bf08da89c06f2e849b66fa9b74 SHA512 79a577b8f45d834f44132892a2946833850cfcf1e84f8d39808ed5c136086323754532df2e286fbfe798b096c87521f88f0564041a1de9cc0a6b33ca19ab98eb WHIRLPOOL bd5404fe1799a39f7094bc93917c4edab6056c4b9328c426b68870871002ca29e4c1154f5772c9934bda4357c596fb93faf9a6c7c3262f038e387ec688aaed1b
-MISC ChangeLog 17033 SHA256 e55d24852d1ab89f91ec546177797fc155077af1de8ffa18e777c3c9f6b7b271 SHA512 f0031ad3ca182efc28d959a30f0532c622ed2cdfac191b4decd28f581a2392165e8be0df961b0bb7527897f132253a6f4552685fe69531313e7f502806bd5329 WHIRLPOOL f14f04c724c72e1e7a51cbd7d39aa7ef59842beece123d4195245a666dc2b346264911ea89f38dfbc8df02e350bc0f5a1d055fa7332e5f38adcc56ba8688a33c
+MISC ChangeLog 17153 SHA256 3561e6140f54e104e1892a50d654ed2529b619ba01947c15fd4bec8afceae122 SHA512 6f9936e41254fc7146fc45767283b0c7dfb95b7a7a0b8ed6f330bc2339e61e8118d5339dab762983b991f407d26ec25983a80f30efc29c60dae76e9234b91f1a WHIRLPOOL e9db738ee2162ae5da25c4cdb538b10ea06e109cd17f2a39504496318519333fdf6f76e8dc1e2a32d2492f1bac9f9e40b9ba86061194a739c45ee8da1bd43b2f
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHMgDcACgkQvFcC4BYPU0qg3wCgtaDan/a2HQuqAZx7rxlVGw5+
-hpMAn1RhSRBNRKIul7xt3t64gGXxeRVA
-=2zMO
+iEYEAREIAAYFAlHMglsACgkQvFcC4BYPU0okQgCgi4V3p5DCG3YswVkAyXdsmo4W
+NpUAn1DzJx6jKyp/i+Em4fmNNycFyPUw
+=xwWG
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild b/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild
index 620c2baefbc6..672e46c7c982 100644
--- a/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.2.0-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/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild,v 1.3 2013/06/27 18:11:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild,v 1.4 2013/06/27 18:20:10 aballier Exp $
 
 EAPI=5
 inherit autotools eutils multilib-minimal
@@ -17,7 +17,9 @@ IUSE="+alsa altivec coreaudio debug oss static-libs +threads"
 REQUIRED_USE="|| ( alsa oss coreaudio )"
 
 RDEPEND="alsa? ( media-libs/alsa-lib:=[${MULTILIB_USEDEP}] )
-	!${CATEGORY}/${PN}:2"
+	!${CATEGORY}/${PN}:2
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
 DEPEND="${RDEPEND}
 	oss? ( virtual/os-headers )"