fix multilib ebuild by Michael Mair-Keimberger (iamnr3) in bug #484060 and slat it for emul-sdl -r1

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

3 files changed, 17 insertions, 14 deletions

diff --git a/media-libs/openal/ChangeLog b/media-libs/openal/ChangeLog
index dcc4546e4bc9..0c65bc49f375 100644
--- a/media-libs/openal/ChangeLog
+++ b/media-libs/openal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/openal
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/ChangeLog,v 1.168 2013/09/06 21:14:10 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/ChangeLog,v 1.169 2013/12/30 07:35:05 aballier Exp $
+
+  30 Dec 2013; Alexis Ballier <aballier@gentoo.org> openal-1.15.1-r1.ebuild:
+  fix multilib ebuild by Michael Mair-Keimberger (iamnr3) in bug #484060 and
+  slat it for emul-sdl -r1
 
   06 Sep 2013; Ian Stakenvicius <axs@gentoo.org> openal-1.15.1-r1.ebuild:
   dropped some unnecessary emul-linux blocker atoms
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 7825954281f9..efd695114838 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA256
 
 DIST openal-soft-1.15.1.tar.bz2 253006 SHA256 0e29a162f0841ccb4135ce76e92e8a704589b680a85eddf76f898de5236eb056 SHA512 ca6dafdd503d06892dff08763bc00b974ec6e7c4bf3dcebb4cb41a486b4ea777c278299a198db182fee888a19a5716bd57d91a2859b764a532138a79f2bd672f WHIRLPOOL a47fcf4cc5da9576cb4683371979175111a1ec746c87ea1140bfb1b71433a3fe5d3df338e8844ab62adc0e6decb4b481d6d8fedb6f635b5bac715d5789077902
-EBUILD openal-1.15.1-r1.ebuild 1472 SHA256 88b194c7b0f27c2d28ead7b72615a6771847b667c041499b288f86563d53d74e SHA512 5842ff52afea0c407486c41a8d9ec52246b9ef2153c9c73801759149ec68e05eadcbe11edc406686a2cafa0dd02da5fb222ea27b4745d84c60590c21dda44b68 WHIRLPOOL f86e83257667febf093967ddc997949c472298fd5314db070e05fb80ebf420eae18bdde7fea0e57aac56e62a241e87f8eab9fc66192e24513e4d437852cacfeb
+EBUILD openal-1.15.1-r1.ebuild 1510 SHA256 47fd331749096f9fb6248d943f5d3e1288ffc97b818e9339bfca634971c93cf2 SHA512 9e8f15d7b65a742f8f64a5ce85aadf642a7a7b1c5d94cf2d7efd0b1477c2afcec96b24351a34ff11d4e9276313b71d50f73f159878928edb60dc57d51e7e466e WHIRLPOOL d686284b7b83ac3e6a22c9e739c1242b1fa00bff99e397d6376775e354d70f72f63b8e6c581aac2fc784f644821700883d8f1b9a1036c4b87e3611aaa97bd9aa
 EBUILD openal-1.15.1.ebuild 1268 SHA256 5ed19dfe207f71e06a1d1732768ac0919a18e2e5e14983ba25816724e90a037f SHA512 97d9a743b98461544444239c509410282c69ca88cf1233112362e33410a776ce4f35268b8a3f462f1f6f80ce1c6493eb4d77b9a5937769e1eaca48e7af4db4a7 WHIRLPOOL 1f1da719a69287f4a06c96d77bc86268bb0a270ec29bc8c29d5c006b51de86bf4f3c14b4dbdf60c5489df261e9e6ea38c34797ad37adbab0e358d55d05890f7f
-MISC ChangeLog 22811 SHA256 ec51d62177e98772623f9dc6230b35d459867f97d6ab3e60a817fe3a4d7c37b8 SHA512 12e1066f324fd172e63f60ec21fbecc3ddfc8324374fc72b4b0f73516b1ff3ad85bf832d5850aea69d0ff4a2d3aa7138572053838a45f1b0b45fb052a25e1691 WHIRLPOOL d86c2f2d1ce8a592e8563250104adcbbd1afa129e5ed731d85d2322578d66817509b69ec704fc966de170b710d318f5d78d7c0c00d4f8734de5306556e81bc2c
+MISC ChangeLog 22998 SHA256 f640a0fe0d97fedd085884f81dee6bbe02b090dcdc668cf740aa9c8c7d98ee32 SHA512 a32d99c4ef9494b55c6328d05836048b6f9222200d3062083beba4cb3990ea89b0c0c3099c400ade500d09f140b9d82e933ce506a2b4ee6346b87bfa87785b05 WHIRLPOOL 974d2c0d2a65640bbeefd3e8691d035ccff660cb1a4e4e5e9d65224b79651532a22d958ad2251bfb9f6ba1b4104e6c9433e143f93d31e1ebbe1dc3a59229ae6a
 MISC metadata.xml 265 SHA256 9a3ea9a8320522c120558f8da404f7ba56e76fbc86ac9e4d6ca5d0c810388b5f SHA512 f7fefef8b7192a78d1cce076f918f7999bb4ff4cce2e887b8ab19dbe0cf5ae3565692abcb6f70599c26261b8ee0d361792b1443bb139371530f32c2a813c2a96 WHIRLPOOL c5f2cc091fcd50da41333c156af8159729e1072fcf0620a4f5c93850dea7a5b7872211a4eb530085169b501433786c52ec5762fbe90d88038f0f2f61be4c1cba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlIqRakACgkQ2ugaI38ACPAO4AD9Gn7RfGdA1GbF/iPDK8nE1e0r
-mH3sfh4FPGFQ1msxYRYA/0RC3B2uYEHO+eOZjCwi19FYtTQ2VjA/3zgidHX119Kn
-=cYfD
+iEYEAREIAAYFAlLBIioACgkQvFcC4BYPU0qAnACgx5Fkw/TFvfhLJ46rbkb+Hcre
+9SAAoKEU5t6p93QAp5zxtThhTbUGLYR3
+=RXOd
 -----END PGP SIGNATURE-----
diff --git a/media-libs/openal/openal-1.15.1-r1.ebuild b/media-libs/openal/openal-1.15.1-r1.ebuild
index 3faba6303485..bbc851ded7c6 100644
--- a/media-libs/openal/openal-1.15.1-r1.ebuild
+++ b/media-libs/openal/openal-1.15.1-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/openal/openal-1.15.1-r1.ebuild,v 1.2 2013/09/06 21:14:10 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-1.15.1-r1.ebuild,v 1.3 2013/12/30 07:35:05 aballier Exp $
 
 EAPI=5
 inherit cmake-multilib
@@ -19,12 +19,10 @@ IUSE="alsa alstream coreaudio debug neon oss portaudio pulseaudio sse"
 RDEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
 	alstream? ( virtual/ffmpeg )
 	portaudio? ( >=media-libs/portaudio-19_pre[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
 	abi_x86_32? (
-		amd64? (
-			alstream? ( app-emulation/emul-linux-x86-medialibs )
-			pulseaudio? ( app-emulation/emul-linux-x86-soundlibs )
-		)
+		!<app-emulation/emul-linux-x86-sdl-20131008-r1
+		!app-emulation/emul-linux-x86-sdl[abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	oss? ( virtual/os-headers )"
@@ -37,7 +35,6 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use alsa)
 		$(cmake-utils_use coreaudio)
-		$(cmake-utils_use alstream EXAMPLES)
 		$(cmake-utils_use neon)
 		$(cmake-utils_use oss)
 		$(cmake-utils_use portaudio)
@@ -45,5 +42,7 @@ src_configure() {
 		$(cmake-utils_use sse)
 		)
 
+	multilib_is_native_abi && mymakeargs+=( $(cmake-utils_use alstream EXAMPLES) )
+
 	cmake-multilib_src_configure
 }