Use multilib migrated libmodplug, libogg, libvorbis and gsm when abi_x86_32 is set. Others have been migrated but I will need to review them more carefuly.

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

3 files changed, 68 insertions, 1 deletions

diff --git a/app-emulation/emul-linux-x86-soundlibs/ChangeLog b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
index fc894e1a03f7..936758c7e138 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.91 2013/03/16 15:23:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.92 2013/06/26 18:18:39 aballier Exp $
+
+*emul-linux-x86-soundlibs-20130224-r1 (26 Jun 2013)
+
+  26 Jun 2013; Alexis Ballier <aballier@gentoo.org>
+  +emul-linux-x86-soundlibs-20130224-r1.ebuild, +files/remove-native:
+  Use multilib migrated libmodplug, libogg, libvorbis and gsm when abi_x86_32
+  is set. Others have been migrated but I will need to review them more
+  carefuly.
 
   16 Mar 2013; Pacho Ramos <pacho@gentoo.org>
   emul-linux-x86-soundlibs-20130224.ebuild:
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r1.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r1.ebuild
new file mode 100644
index 000000000000..9cb350e444e9
--- /dev/null
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r1.ebuild
@@ -0,0 +1,36 @@
+# 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-r1.ebuild,v 1.1 2013/06/26 18:18:39 aballier Exp $
+
+EAPI=5
+inherit emul-linux-x86
+
+LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 MIT gsm public-domain"
+KEYWORDS="-* ~amd64"
+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]
+	!>=sci-libs/fftw-3.3.3-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(-)]
+		>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)]
+		>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
+	)"
+
+src_prepare() {
+	_ALLOWED="${S}/etc/env.d"
+	use alsa && _ALLOWED="${_ALLOWED}|${S}/usr/bin/aoss"
+	ALLOWED="(${_ALLOWED})"
+
+	emul-linux-x86_src_prepare
+
+	if use alsa; then
+		mv -f "${S}"/usr/bin/aoss{,32} || die
+	fi
+
+	# Remove migrated stuff.
+	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native")
+}
diff --git a/app-emulation/emul-linux-x86-soundlibs/files/remove-native b/app-emulation/emul-linux-x86-soundlibs/files/remove-native
new file mode 100644
index 000000000000..dc3e0c9f7687
--- /dev/null
+++ b/app-emulation/emul-linux-x86-soundlibs/files/remove-native
@@ -0,0 +1,23 @@
+usr/lib32/pkgconfig/ogg.pc
+usr/lib32/libogg.so
+usr/lib32/libogg.so.0
+usr/lib32/libogg.so.0.8.0
+usr/lib32/libmodplug.so
+usr/lib32/libmodplug.so.1
+usr/lib32/libmodplug.so.1.0.0
+usr/lib32/pkgconfig/libmodplug.pc
+usr/lib32/libgsm.so
+usr/lib32/libgsm.so.1
+usr/lib32/libgsm.so.1.0.13
+usr/lib32/libvorbis.so
+usr/lib32/libvorbis.so.0
+usr/lib32/libvorbis.so.0.4.6
+usr/lib32/libvorbisenc.so
+usr/lib32/libvorbisenc.so.2
+usr/lib32/libvorbisenc.so.2.0.9
+usr/lib32/libvorbisfile.so
+usr/lib32/libvorbisfile.so.3
+usr/lib32/libvorbisfile.so.3.3.5
+usr/lib32/pkgconfig/vorbis.pc
+usr/lib32/pkgconfig/vorbisenc.pc
+usr/lib32/pkgconfig/vorbisfile.pc