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.

(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

3 files changed, 21 insertions, 4 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/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