MULTILIB_USEDEP is needed for consistent 32bits support with pulseaudio and alsa-plugins (#547628 by Lucian Poston and NP-Hardass)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 16 insertions, 11 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index ece4e0cf6e84..9ae764b441cf 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.385 2015/05/01 19:31:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.386 2015/05/07 18:53:47 pacho Exp $
+
+  07 May 2015; Pacho Ramos <pacho@gentoo.org> pulseaudio-5.0-r7.ebuild,
+  pulseaudio-6.0.ebuild:
+  MULTILIB_USEDEP is needed for consistent 32bits support with pulseaudio and
+  alsa-plugins (#547628 by Lucian Poston and NP-Hardass)
 
   01 May 2015; Jeroen Roovers <jer@gentoo.org> pulseaudio-6.0.ebuild:
   Marked ~ppc64 (bug #543354).
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 5678fc140f8c..9653c962559b 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -14,14 +14,14 @@ AUX svolume-fix_param_loading_undefined_beh.patch 981 SHA256 844d3a095d26277548d
 DIST pulseaudio-5.0.tar.xz 1455428 SHA256 99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939 SHA512 f3d64bd6e03a732fd812da466b6658004600b4f3d0b9760403b7e113b6d654d54387658bf3704f45f28ab700245433e23fe517e4579130886fc58647eb97be2b WHIRLPOOL c85829c78ded3bbef234e455bfd3778f2daf50de9d7627508dbf131d0c398e35ab3ae41a4b5136f0c0da09249bc9a600ad85d848ba4e1faba74875af0a787036
 DIST pulseaudio-6.0.tar.xz 1469248 SHA256 b50640e0b80b1607600accfad2e45aabb79d379bf6354c9671efa2065477f6f6 SHA512 4f2293b41c8278047a41be4609a6bc267766874001092a91e785b05d5224fd82810862402942dadbb54bed7f74689779c958ca512666dfe6755d29551583cc2d WHIRLPOOL d75724f2ada640dabd256dc9e9840def17e78f63116c31df711d266349e9f4b99efbc797a5108649c860a5bf8ec8199383eaede440d8b4b655ef09f4ce37984f
 EBUILD pulseaudio-5.0-r4.ebuild 10461 SHA256 22895f17dc532ed4c976b79c37253d3ae014bcd8e39d2ddf2276c1cd6010922b SHA512 0894c2f249c1f330a4eb4884579c09592c1c79a6ffccc0791ea0d6248bca27ba337237e9c2abd5804c407b738df30b215259875e4c7a1b41ada2283e3ab072c0 WHIRLPOOL bc592497d2a2e188ebc3799280d2ef05c9595dfa30c02f98d8503f523a0157783d0cddc0ed7371315b950de2c5bdc978744027585c2d2827a0a62f30ea2c7496
-EBUILD pulseaudio-5.0-r7.ebuild 11075 SHA256 418f7dc5ff82f48bdc196fb0aac191aa8a53d5f692afd9ffa26a5661273296a7 SHA512 565d44a44d51f68f0bdf4baeeabbf673b732ac9466046afc44257a37afce5bfeb0f7c4aa5fde80c41a44d451bfd8bfab3b5e888e3fbcf316c9af8f3ed662d75b WHIRLPOOL 7c751e8ed23d7fc2ca55a75afab58d48235e48bde886f3dfd147cf24811ad5898e9ddfacd049d4f99ff90e6a1026af7223d399f8d082bbe4555651cc82841139
-EBUILD pulseaudio-6.0.ebuild 11682 SHA256 eca71861e6cec2e20c1ffd56d96ad2fbcfa8e89a45c28fbd9f921819dc92f94f SHA512 579531fd9c19e8d7c5e0a210f54360637de6ebb71e3f6fc86d57ebb66a9c8780b48056361c4fbba8130190c89a649fd6bb8920e5a69049df916f6209309ba8fd WHIRLPOOL c56756d27d2b60cc444a32e3ea7d8282fb2ea313758c234ba0ddbb598a436a0112b8b220217e18f35cb173651c290612af4800934a971f974a7a1b364732e1cb
-MISC ChangeLog 72696 SHA256 1da056557b80101932f6d473e33c5eef0f6db69dcbc5db981aa5cc34bb2a1a82 SHA512 71226516dd992ba9865e73cdc528550756728f3eb0f98360c4b64996333cb55e7d0310dffb6da17cb3dda4c7c5f13b99a24b2cc1ab5c476c569a6ef0c46e7307 WHIRLPOOL e527667928d7d7b88cb6216852e9984d8e657524467deeded0c0ff089be1899026aa0015db4949f2ace10d48aac2b5dff23cb6a775649b7d6e03ae928b166f59
+EBUILD pulseaudio-5.0-r7.ebuild 11090 SHA256 1fd538b70e00c9fe0afbeb84a3925623d4d1541ab522f2637a8a410eaed12036 SHA512 c8e710d559a814b9998c7df815419683eca6848d42c62afa869d99ee6ce34006d91b29b321ade6caf96184bcbcbc27b9d0c098cf27dc89a58487f5775e86d8c9 WHIRLPOOL 6dad8d15ecaeb899a72a2842123b0565cdc42dfefa0f8c41b50593e0975608dd9e4f44e390c3e6f444014d989fcff8e19daf8a3786fdc2f946ad0bd6c3e0d81a
+EBUILD pulseaudio-6.0.ebuild 11704 SHA256 3885dd2755a4ceea9ab5e1764248f440f501b2426a107abf07ad04cf8e666897 SHA512 db07739841404a435b36b13e2137a25f077e38663e896192e2b253b2892cb9d8c766ca20afec8fdb4809b2b6c20233e169d150b6c4c7a3d7248b438282932ae5 WHIRLPOOL cffd9ec1ba723bd0878da77b2cbf7ba5a5d3c16674191fb460e5db8a85fd49bc907b8990a2c89474781a56a131ca68603fc5455b5f2c64df991acb9c8bb87df1
+MISC ChangeLog 72931 SHA256 c2e3da4c0274321ee039a3c0a0c0f5523c793d9cd8125d6ba518770afa0fbd26 SHA512 b0b46b3c039ee65a51be7e6cc067a1a8239934f81339ac7a1aee43ff5f461d0c1fab25d5353cb738a8578b2a4ec4a97b78c7fd8ee1b0f25b211cc81b08f3cb3e WHIRLPOOL 97d794d42decbd22142d1ab049a6ce77de2eb04e9e4012cc419ff77dcd99fcc734b255941ed0b4fed454180981c4104f38ccbd8c44d372a39c47d48fd31887a9
 MISC metadata.xml 3321 SHA256 6898c911257d674e31c3953817368f932b435b6bf814539c274740d6dd99992b SHA512 59f151fe5a7505f84ce426f0f1eab6219a67c98dec8aca2239fc5c96a21669c7dfb311b6f5ff2db4bf486981ad52fcf039c63f0465c8870bbf48df1357e9904d WHIRLPOOL 1b577d5f2771ea31a3f7b0e7bd391595ec74d99251255f3de12fcd4b92e17d65d4a3dbbb51e8952d3ea08f6298c45b400ffb9bcb295ca344d607fead74dc6032
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVD1JoACgkQVWmRsqeSphPq/gCfTaHB5KWuDgcS2V9FBQRyYgRz
-RosAn0x2qwWhFfEUg1qI0Te0nI49O1WK
-=+clp
+iEYEAREIAAYFAlVLtLwACgkQCaWpQKGI+9Ss7gCcDXH7hhDnwGgd/JC+CBoSRKGE
+9QkAnii1Ym+WWdkPyWYkgEiwSPSQFdW9
+=IdZ7
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/pulseaudio-5.0-r7.ebuild b/media-sound/pulseaudio/pulseaudio-5.0-r7.ebuild
index d9a0dfdbf50d..7101d0d81ed8 100644
--- a/media-sound/pulseaudio/pulseaudio-5.0-r7.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-5.0-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r7.ebuild,v 1.8 2015/03/17 14:19:01 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r7.ebuild,v 1.9 2015/05/07 18:53:47 pacho Exp $
 
 EAPI="5"
 inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info readme.gentoo systemd user versionator udev multilib-minimal
@@ -92,7 +92,7 @@ DEPEND="${RDEPEND}
 "
 # This is a PDEPEND to avoid a circular dep
 PDEPEND="alsa? ( alsa-plugin? (
-	>=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio]
+	>=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}]
 ) )"
 
 # alsa-utils dep is for the alsasound init.d script (see bug #155707)
diff --git a/media-sound/pulseaudio/pulseaudio-6.0.ebuild b/media-sound/pulseaudio/pulseaudio-6.0.ebuild
index 2e736f0ab037..6f8d4bd5a72c 100644
--- a/media-sound/pulseaudio/pulseaudio-6.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-6.0.ebuild,v 1.9 2015/05/01 19:31:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-6.0.ebuild,v 1.10 2015/05/07 18:53:47 pacho Exp $
 
 EAPI=5
 inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info readme.gentoo systemd user versionator udev multilib-minimal
@@ -98,7 +98,7 @@ DEPEND="${RDEPEND}
 "
 # This is a PDEPEND to avoid a circular dep
 PDEPEND="alsa? ( alsa-plugin? (
-	>=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio]
+	>=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}]
 ) )"
 
 # alsa-utils dep is for the alsasound init.d script (see bug #155707)