Update the dependencies to support emul-linux-x86 alongside multilib.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

diff --git a/media-sound/apulse/ChangeLog b/media-sound/apulse/ChangeLog
index c1e9fe1c6fd6a15ae90f71033b9996b41d6e86f6..8cbfe0ddb79bcf0f8bbb53ea343171552acd9bd0 100644 (file)
--- a/media-sound/apulse/ChangeLog
+++ b/media-sound/apulse/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/apulse
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apulse/ChangeLog,v 1.6 2014/12/04 19:54:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apulse/ChangeLog,v 1.7 2014/12/04 20:15:03 mgorny Exp $
+
+  04 Dec 2014; Michał Górny <mgorny@gentoo.org> apulse-0.1.4.ebuild:
+  Update the dependencies to support emul-linux-x86 alongside multilib.
 
   04 Dec 2014; Michał Górny <mgorny@gentoo.org> apulse-0.1.4.ebuild:
   Replace pulseaudio blocker with alsa-plugins[pulseaudio] blocker. The former

diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
index e0858ed805feecc423f258593d1cbf91a24eede9..a5adf1eac524d6ebe0ea87258722ef7695bcea07 100644 (file)
--- a/media-sound/apulse/Manifest
+++ b/media-sound/apulse/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST apulse-0.1.4.tar.gz 99976 SHA256 717bc537c389af546b4db2ed7622a8896f7f0f306612c9eb6c693a70c104c86f SHA512 500abca0f6b4df35acb417744a5967e58ceff8cc2a0d640db03847d79b077295abe8888ee5d0008383349bd964345a340334f39e1f55286713db94a86c6596dc WHIRLPOOL 7fe604ed3128cb24d375f4f84ee77317fd499202d8bf46f9c68735501b35a55050852d08260b2c4ad0419ac32a3d330946c65aa402b9b66dbf6d25c3a92966bb
-EBUILD apulse-0.1.4.ebuild 912 SHA256 306a77331cb30cb1ec1acaa6e99ff06b79afc42de4d51df1608a774a62caf37a SHA512 baa0eb92705ee65c947c4441b573d259e18390b73d1e10b4f48275ad85dbd84784888522ce3712eae703d582d511d6e7f60f66be2875227495d94b48838c8be7 WHIRLPOOL 8d9a3ec2618c6b02c98c31aad3318eab9f8940524d020b57b92eea3e663c6cf19c35d5182f70269a2c1f03be8a89340dbcc92074f552c9790da2e823939e8570
-MISC ChangeLog 1703 SHA256 24c1656b1b959f67182beaefe699abcc38c7a7916b7da24b51c88d2fc9e5f8c2 SHA512 38218d0bfe75d77a04d041a254823c15d3e7ff560017b359b4e07c9c6a584f1994d1e1f33eb0944b7a940fae35e71e3cb2fcc6e1376eb07e4b1547a0d1b122f4 WHIRLPOOL 5e6b7bf4a2cd9c4b1b00f89bbe1a61a70e68dfa5f79af05eddf5932bba4bd74344209690e9fdb394a48e8c94a9c0b6ef10f33451e3e0e9b26f5e6f31adb6b2d5
+EBUILD apulse-0.1.4.ebuild 1060 SHA256 dca7d82126303d441fa1d03d5c56d91b7a8f124c4d5fca3a2e4dd47d6400ec75 SHA512 b13a3219f205a9ec0dc931544e23aa6487c7d6e2c00a520c4a15491f470696ea5d03a31eccfddbef4ea9f53c37024686c531b080a9c16e2a25cb0e50916b001c WHIRLPOOL 177652907e4e7f32791b7ea59b2e70ea9e655b3db6b8cecb4a1bf7a1b038936c2efa10ed5af82a64b08c825000742cf79b68a9556c4b2b9f9fc49e56cd2822aa
+MISC ChangeLog 1847 SHA256 59b833bcf47bea882a343bd9642ab37b57d601ff9fbce9c12518f0557ef971bd SHA512 b29e27419c4e37234ea31a2cc1a6601a34a3c86bfe50332c5849dc148dbbf9e596819dd2f483e0a07a72d7bf3b257a35f8043fe5b3f1de0cd071482299a2f545 WHIRLPOOL 1bbee29c7173d6dd15828e7f077ebd8eb2cc8e0cad22f67a4a63640801e7b64bae7975efb59752aaf1fc86bfda67f792669a4ef93ae0d87664db3efdb4fbed06
 MISC metadata.xml 202 SHA256 66924d1d7f45f552c62ec96ec663c0af1c93a721ab42ee8f13ddb36bb5d0ae35 SHA512 3f45e8572f4ebed4c3fa9cec5d0f440b0316939f57866bc245e5fe95532c5aa260debaae7fa8bbfda83fd56b609d8fb0c11717325a8f0d6abd4dd2e21c6b4f07 WHIRLPOOL 517078266cdd2f27f28acc76d2ab6620c4a9bdc018119feaf451c79fcf4ba6cceef9d95ac85e18db29503805b58c99415eec802609307221abd8635ecf200f79
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUgLv4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUgMDKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOQYQQALDLPc68Y1scQ1GqF+K/r5Hw
-X1eSjL5rn3wVdsH/N0wbWyACLyVPzeOnUMjvZGgAzl5mtpPPZVuKCv4NkmqI6rHB
-N6YyBWWjQR4ZGDOnjd/XEdHeVVOVMjS7ZsrVYH2iLg5ZvbZJyV4zijGFjZu//+9m
-VnhBd92pA3ftHw4dui8YyP4Nkuxlw+w/KJg/EgcUd49Xvb5iEqHJ/NHFaCBHYsUT
-x8Zxfllei1ZHic9PMF0DERnZuhzPPhNtyj14USlQhn0fw6NPrlczBR33hka4s6DW
-68s/jW98SvwKhy1YX3+Tr9hSzsUWnq7akeWs+TtGSfQP6lupQJ8Js0c3EEz3NNoP
-Ey0BsXk6teXadUUIPVSeN5fXdYFrRF3+0M2qMHxtKh6GJmF3XyvjxM3X4pryZ8gm
-jNuzkVX8AITdzup++zfoFhRcQ9czcfLKXiUqf5/IOn4RPNRSjZlfKb5PCu1HqHvI
-DFW6+up59lkpMOTRbk8PiLRCRjAkTLBNu4zGSxNndLXGsLSZFOlQyOMGUOxBrvtq
-h63EbRax+2J6TP85AEkcCgXqkaMCXQy5571FhWXsLfGpDItRO/z/lFVN3PvF3oRq
-TjqwVDHwY0RG0DOdR+uSNyrz/xlwn6xZgvbh2GggReTWnj4ALJrJHBV08aHOvh3S
-wsZGbChywhc9zPrrmcGs
-=fZq4
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOBwUP/ifao3SjnUOZWWoUZzJfJreq
+18vSaZvp9X/hxZybcqS7ttHoysDgDaxFeTxjQTE3z9IwjGwiikIgmMIWdxk/7/4F
+oIlgX1YLDEGaIDvGADHLFrzV5bb7ISZ1BqEhwYjG3XltgyNi0Ml24C3hnxciQgex
++nSZiDmZvYtB/qaK/AtxLQtm7Xbebbsin2zGzUU6w9A8Re3dtuhgk3siV1yCaA6/
+0VvEDdg68+QFIFdgraYsgBhJOkUjMiW5GXHAdtHJENKb9+ccT6GLHuk7MKK0Ubr9
+ClLgVLhodZlJ3XL+MnDKg+CIt45pTZSDAudWSlcar+CraZ3tUuOsPDzpjElnp7OV
+uPHLOMucANh+fN5N3POkK+oMSZJKBaqDSH7UfMLicbpaNYVmAFe/2e1J8buT3Tzx
+ZgHZ67xcTP5EI3FQcdt+wMLOcPX/WTXUI1R+b2Y6335aq8XXGoyKgMUL4LLtnozD
+VMZWTAxL8Rk0liOMeDnx2PPv6R+l3QwePqzLxl0dneklaozJ/nl3iKKqpTWS3FH8
+yNMHse2iHE9OzWxmRdooL6Lr37UcuXIvdsF3ZMh2vXkS2eIWiHaB5s864ysznKBH
+2ejnQVmQ07ZaV9m+cLLzaWuhrtm08hj7X1BwJw8Lx51T1b0wwATE8GOzQwUqjcow
+9KIvsPpSbWtha6/7xRJ6
+=6b2g
 -----END PGP SIGNATURE-----

diff --git a/media-sound/apulse/apulse-0.1.4.ebuild b/media-sound/apulse/apulse-0.1.4.ebuild
index 7fff5101d21cb9c9193742217c7ed50cb52ab654..801673dba173e17f01e7b4e6c350e9692e1e0c9c 100644 (file)
--- a/media-sound/apulse/apulse-0.1.4.ebuild
+++ b/media-sound/apulse/apulse-0.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apulse/apulse-0.1.4.ebuild,v 1.2 2014/12/04 19:54:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apulse/apulse-0.1.4.ebuild,v 1.3 2014/12/04 20:15:03 mgorny Exp $
 
 EAPI=5
 
@@ -15,17 +15,21 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="media-libs/alsa-lib[${MULTILIB_USEDEP}]
-       dev-libs/glib:2
-       !media-plugins/alsa-plugins[pulseaudio(-)]
-       amd64? ( abi_x86_32? (
-               || (
-                       dev-libs/glib:2[abi_x86_32(-)]
-                       app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+# Tricky stuff, we want to support both gx86-multilib and emul-linux-x86.
+RDEPEND="
+       || (
+               (
+                       dev-libs/glib:2[${MULTILIB_USEDEP}]
+                       media-libs/alsa-lib[${MULTILIB_USEDEP}]
                )
-       ) )
-"
-RDEPEND="${DEPEND}"
+               amd64? ( abi_x86_32? ( !abi_x86_x32? (
+                       dev-libs/glib:2
+                       media-libs/alsa-lib
+                       app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+                       app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+               ) ) )
+       )"
+DEPEND="${RDEPEND}"
 
 MULTILIB_CHOST_TOOLS=( /usr/bin/apulse )