remove libmikmod and alsaequal with abi_x86_32 and depend on their multilib migrated counterparts; thnow what is left to migrate is a bit harder I think.

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

4 files changed, 27 insertions, 10 deletions

diff --git a/app-emulation/emul-linux-x86-soundlibs/ChangeLog b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
index 14043e71d2ad..c6eb86373f66 100644
--- a/app-emulation/emul-linux-x86-soundlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/emul-linux-x86-soundlibs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.95 2013/06/27 15:02:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.96 2013/06/27 18:46:49 aballier Exp $
+
+*emul-linux-x86-soundlibs-20130224-r4 (27 Jun 2013)
+
+  27 Jun 2013; Alexis Ballier <aballier@gentoo.org>
+  -emul-linux-x86-soundlibs-20130224-r3.ebuild,
+  +emul-linux-x86-soundlibs-20130224-r4.ebuild, files/remove-native:
+  remove libmikmod and alsaequal with abi_x86_32 and depend on their multilib
+  migrated counterparts; thnow what is left to migrate is a bit harder I think.
 
 *emul-linux-x86-soundlibs-20130224-r3 (27 Jun 2013)
 
diff --git a/app-emulation/emul-linux-x86-soundlibs/Manifest b/app-emulation/emul-linux-x86-soundlibs/Manifest
index fabc728856f8..7b7bfb7da3dc 100644
--- a/app-emulation/emul-linux-x86-soundlibs/Manifest
+++ b/app-emulation/emul-linux-x86-soundlibs/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX remove-native 5127 SHA256 10dadde57b51ee395fc3872a20d72a23404acc2a9d24d38bebfeb366e57aecc5 SHA512 e13d5abfb4f467b895abf3a61598532609222f6454eaeeee392ecf25eaae7782eddb1c703fd5230498403c98c6a597f49e0213f020999d021a0d859f29032db5 WHIRLPOOL a123a41e3f13c4ea8382564d75d552ee9d2e77e3e5070742a11296a76458520c490f7c527f822c0389b46241d943d5dfbf074e32290c8fc43c3b9a563963cd59
+AUX remove-native 5360 SHA256 7809646168f6f88316201bed1fe9db50a782a8db88ebed109b2dba7870bb99cf SHA512 722ad749adc338dbe1e66f69ff3e8c479a1ef120f675700747d7932dd6504c00ec8cfc3f0648211dbb3f5c1f8192db706013cf28fe5019dd7e2972510595c1f4 WHIRLPOOL 17d374960e544e762b01a50538a4adf93950ecbb8fe56336738e39aee7889a01026e89e0794ca48b0031659707605ec303e76dc25d72f988ee23447ebc19b906
 DIST emul-linux-x86-soundlibs-20121202.tar.xz 7097624 SHA256 f14db6acdf2203be725bf921756ae476e258f18ee93da366dd37f28443fc0f97 SHA512 96b10cfcb9144eb9e59df2935eeebf3b099390bbbdf9a03691f1edb19dc367397a906f495c00e9f05f173c2d09ba1ea45bae99d0f9aaa8ecae09371de576d298 WHIRLPOOL 78bcea03b0a1c4239c360adf7e7dc8430c3a87dee5814986ef20e18bfdc1e0d962a75a1b3295bc8b73858d10201ba174612e42af26fee7d560577b63ceb6138c
 DIST emul-linux-x86-soundlibs-20130224.tar.xz 7068240 SHA256 51ee669fb864b8522cd9ffa4aa8148c20eb07c06623a8c0bd718d444867da92a SHA512 67bca8c875e17bb8e1b3057182d08c679992ce525e124162e02e8a2c01bb5413d7ab19736a9f803d8a3835e7c5d68e556de9d3aee7240fb6708d2f3528ae56e0 WHIRLPOOL 48b9583dd91d5b1dbb4dedc1c9f5bf2937a325adad20bb45adf7de96e5d1db6a3e62a617ef85300c917faf57313a00790007d12db3a6dc9261ef627c71f14d9a
 EBUILD emul-linux-x86-soundlibs-20121202.ebuild 751 SHA256 fbc0ac6dc9ab8be17b458cddfd395eb9c4e77b858d567630c4cf6613b158fdbf SHA512 f4f4cc63c8f8ea2f2884697956a098efb8825e076619e563f5644fb9ef77d5f408a5beaa5a2355f19ad14ebf28e1830ba9bc8d8020d2337ffa03ebd3cf553c2a WHIRLPOOL c3c0546bf138432f5f0908a56f3c994d201c7a9bac10576ba75e5a8562cef65ad5557fd710232690d7458fa8887371b3a3d331d5bb40f21695b19ba1ad77fc86
-EBUILD emul-linux-x86-soundlibs-20130224-r3.ebuild 1528 SHA256 6b21f7a728fdee63bf079694b704f7ece1c5ec2a7c069eb078b49dee92334c3e SHA512 e75d909a45d4eec4c758a9979a746b3cdac6b9f26b4ab8097c4ba08cc95572744a96503c4883351f5431e07ba92d8f6f08d57e50aa0a0b549a929bb92c14dd42 WHIRLPOOL 61eab38c8c8b60d229e5c8e9b72209ac6d988968596484664a509cf0e23080c1196a9db2298e299b4ec22f708bb03afcdd0128019f88779f9600ed0c9ef2022e
+EBUILD emul-linux-x86-soundlibs-20130224-r4.ebuild 1628 SHA256 337b5e9e9436d8d68c7219b959a5e6f103f28499d86ef902e69caf6508d4cef3 SHA512 91d1a47ce761d429039f1af0efb97a6df6f974f59852e19a8b0206f1e254a361a6d4b8ef46fda114f5dd80a64092d480ef7dddad4488848facd41566dcfe1b99 WHIRLPOOL 6405d044f1b8f351354416b60fd5a3ec6f1d1cbd0dd8ceb0d12fba50ff1ba801c60821c75e6d067eaa9296336db01e35ca12e9bbb44c5866a669f4cc93b53b43
 EBUILD emul-linux-x86-soundlibs-20130224.ebuild 796 SHA256 820c1ff543ca0d4756ce6201ea6d92422fe86813cc0451dd8a417f55fa5789f9 SHA512 04c9297c4c1fe3e3058bb11fa15bc2088cbf3bb838a0fe6ca306b4918164beb5a0764f758391b846063ca0ab596aecc70388b3b9c0639a5a335cf5df9ae249c1 WHIRLPOOL f56fb097e6bfdccb54b664df82deb0bc1fd7e528dcfce7e6d9b486ff86bedfa3fa5a8a8038854f9af093490c958292e5bc6e0e5f200b9c01ad2877e11b187f3f
-MISC ChangeLog 18176 SHA256 f1bd497b99a8fa388e442b7bec925a1c832ea9968ae6eefeaa8856001b7666a0 SHA512 cf82eabb0d1997f5ec05c8153882ffe824a11cd7ca79d60bbc7528d0ba59ca1cb5f5820894d0c17c8c265424911e02fab433fc4a7028003e6c8dda9a427c34b1 WHIRLPOOL 25f443426839652734e9cdeba0d83e88393e9982c8a863e7a9cce72e2b67439c13c0c4f8a58c12a3c48cb3c9f2691473953e70e984def5c87af0246ccc03a134
+MISC ChangeLog 18557 SHA256 155a02c808677a7f6b456f9830c3477ce0ad6c3326f991c947209bb1d92aa1ce SHA512 7cd3c243d5179c4dc4502a788b72a39d0bdd47de56ad99ffa30eb606640e92a69439e366a93e2fa85e161349927142e467fb25755f754536d0986b1460a3c003 WHIRLPOOL 351fda8f7d3caa439b1f54cb7901d7f61c02a53725e83a9fa684825a986621e3ce4f5348b2cd41ff7d2aade87e15962f6100cf3506467f77575c1149ff77dcf5
 MISC metadata.xml 225 SHA256 0ce288a649a1cbdf01d699a90300d341736ab0fd3456fd1002e2ffa8d409f453 SHA512 924fc3abc73e518a76ae8255dc51a98e2a96c5e0312b15a3b5f12e278b2b4345d0de8a7a2eb91dbad0b9e55e2c38ccc215fac8b07ff73ccd2fd9843e68531cf5 WHIRLPOOL 9ecaf784ea9cc1ae7e81cead25eb99cff6f61247a2f33ccf27782ddb17c2642f63a6892b9b664015d4f278469b2c8ef93b9f69b9a6d1f15cfcc55ce41451c503
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHMVCUACgkQvFcC4BYPU0pKFwCgjkPS6qCjvmG1fNZZND1zi53O
-yi0AoKHrKx9z+HRLZEhGlZhLrdRczP4A
-=ET6b
+iEYEAREIAAYFAlHMiJsACgkQvFcC4BYPU0qT5gCgihp0rwtU/yhMRnLRb1/cXcpG
+NdQAoKaY+6dMEp6yWkoy5pIx4oAD+1MU
+=H8aK
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r3.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r4.ebuild
index c1780cd0d11b..f838a04e3efb 100644
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r3.ebuild
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r4.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/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r3.ebuild,v 1.1 2013/06/27 15:02:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r4.ebuild,v 1.1 2013/06/27 18:46:49 aballier Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -11,8 +11,8 @@ IUSE="abi_x86_32 alsa"
 
 RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
 	~app-emulation/emul-linux-x86-medialibs-${PV}
-	!>=media-libs/libmikmod-3.2.0-r1[abi_x86_32]
-	!abi_x86_32? ( !>=sci-libs/fftw-3.3.3-r1[abi_x86_32] )
+	!abi_x86_32? ( !>=sci-libs/fftw-3.3.3-r1[abi_x86_32]
+		!>=media-libs/libmikmod-3.2.0-r1[abi_x86_32] )
 	abi_x86_32? (
 		>=media-libs/libogg-1.3.1[abi_x86_32(-)]
 		>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
@@ -26,6 +26,8 @@ RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
 		>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)]
 		>=media-plugins/caps-plugins-0.4.5-r2[abi_x86_32(-)]
 		>=media-plugins/swh-plugins-0.4.15-r3[abi_x86_32(-)]
+		>=media-libs/libmikmod-3.2.0-r1[abi_x86_32(-)]
+		>=media-plugins/alsaequal-0.6-r1[abi_x86_32(-)]
 	)"
 
 src_prepare() {
diff --git a/app-emulation/emul-linux-x86-soundlibs/files/remove-native b/app-emulation/emul-linux-x86-soundlibs/files/remove-native
index 53946b9fe45d..de34338ce04c 100644
--- a/app-emulation/emul-linux-x86-soundlibs/files/remove-native
+++ b/app-emulation/emul-linux-x86-soundlibs/files/remove-native
@@ -157,3 +157,10 @@ usr/lib32/ladspa/vynil_1905.so
 usr/lib32/ladspa/wave_terrain_1412.so
 usr/lib32/ladspa/xfade_1915.so
 usr/lib32/ladspa/zm1_1428.so
+usr/lib32/libmikmod.so
+usr/lib32/libmikmod.so.2
+usr/lib32/libmikmod.so.3
+usr/lib32/libmikmod.so.3.0.0
+usr/lib32/pkgconfig/libmikmod.pc
+usr/lib32/alsa-lib/libasound_module_ctl_equal.so
+usr/lib32/alsa-lib/libasound_module_pcm_equal.so