Accept multilib bluez-4 as well.

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

4 files changed, 34 insertions, 18 deletions

diff --git a/app-emulation/emul-linux-x86-soundlibs/ChangeLog b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
index ab339526b8ce..7d58896b626a 100644
--- a/app-emulation/emul-linux-x86-soundlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/emul-linux-x86-soundlibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.120 2014/05/09 19:03:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.121 2014/05/10 10:06:35 mgorny Exp $
+
+  10 May 2014; Michał Górny <mgorny@gentoo.org>
+  emul-linux-x86-soundlibs-20140406-r1.ebuild,
+  emul-linux-x86-soundlibs-20140508.ebuild:
+  Accept multilib bluez-4 as well.
 
   09 May 2014; Ulrich Müller <ulm@gentoo.org>
   emul-linux-x86-soundlibs-20140406-r1.ebuild,
diff --git a/app-emulation/emul-linux-x86-soundlibs/Manifest b/app-emulation/emul-linux-x86-soundlibs/Manifest
index e7fcfd9c88c3..8574071523ab 100644
--- a/app-emulation/emul-linux-x86-soundlibs/Manifest
+++ b/app-emulation/emul-linux-x86-soundlibs/Manifest
@@ -7,22 +7,27 @@ DIST emul-linux-x86-soundlibs-20131008.tar.xz 6700140 SHA256 4afbaea80a493556475
 DIST emul-linux-x86-soundlibs-20140406.tar.xz 7230696 SHA256 83585754db38294dbba72d9a60623e988fb58df3895bd93acaf223c92013f3a9 SHA512 323323e6a195bbe4ecdc7d4ad52160945fffb906a0f8edb0845984649449f2fac57ed1ce89b7fb71d4479c2a7152ca580a75b86bf89882e8aaa435229ecf5f28 WHIRLPOOL fe35f35c44bc2e3fb5c03260b897b5df7bcc079e371c2fbfb3cb6c16d002a0999d0958140398225faa0fd36f7ba1e40f29dd2c36dd9f9ee8b3990fbcfbd4443f
 DIST emul-linux-x86-soundlibs-20140508.tar.xz 7259656 SHA256 6d79654e4c93f1f7f289fdab3125aba80d66b08ef0677c6e46869ed2488320e0 SHA512 5ee5efeffdc74bdf5f98d9bf862de4a90b22d0bac4447919f044bbe4a2f66a672901c3dbf79a52cc302e27b06a03aa4266b7143918afa364e2d7623190c99cdb WHIRLPOOL 96412024eaa8814ed334ae1087c099b690dcc1b64fd105f246b6740f6679036d2c61420d76c034780084fd095648d879aa9522213bd2b134fd9afe74cbfcce9e
 EBUILD emul-linux-x86-soundlibs-20131008-r2.ebuild 2517 SHA256 4adf1813c750a07ecb1fe96aab0d11aabd7e375392b75a355ea9d2dc91be936b SHA512 155bb7b388b2b135a161c04216f6871e39ba55e5a5ec44cd2122e40f9026e81b5b8a8f8f05a8fd934662108ac4aa788dc9e2d3470f4423f093b49497fd7d1a08 WHIRLPOOL 9ff33c27e4807c233c4eb9abce15b83454f1b80ae185b12088ae1a9e1bfc686e225e18973b3fde46b9f3d226f96e87b986d26c553a3efb8ab533242dd57cb3ff
-EBUILD emul-linux-x86-soundlibs-20140406-r1.ebuild 2536 SHA256 24482e8864a0e9d15a8e82e2cf416f08012f16c12cfa60b2385195437759f04d SHA512 eafc1ecd9335ca56c2b6d6131eeed38cdb44f7ea9864f718bd2485a229744e3371440903ab0971ba719e8be625272a6e6034c2a28999016c81f14cb2c66a1bdf WHIRLPOOL a052209ce5136837ff1fb0a7af2b6711e5e91c4c86ea2c3007eeda6e09f968f4ad1f1107e18ad9f86b3c7d95406b4556fd0538d1a55e3bbda68e8c46b43123cd
+EBUILD emul-linux-x86-soundlibs-20140406-r1.ebuild 2598 SHA256 cd4d14d4aa6da2dbc4edfcbf583335f08c845f43f36a3c6672638cf37ab4416f SHA512 b13126d66c3eec5d02090937e69be62091d6c811c075e556504950603b1d1470c27285b343ec95dfe74fc33c6c5b55efd62d0b326fdcccd788e07fa9df3791a1 WHIRLPOOL eb9fff30424d8391e49a0ee860b2c52fa3e31fc63c349c965dfec0514e0403468d1c8c21475bc6a52c59da4161f80a7a4411de2505734151d449fdc8f9d8a320
 EBUILD emul-linux-x86-soundlibs-20140406.ebuild 2531 SHA256 ddec29cfe18de767bd72ce300b05922dad4ae41686d8cf0b84c35771433b0526 SHA512 b17ea0ca6ecdaa59da8e214da3c0131376505c4ccdbfe0f0f15cda177a907c6ed63c7fdf48b9d6cd9271a52d94910ca91634d8849d93ff127c2bc3c36c6e9603 WHIRLPOOL a3951d8fb3de0848db6705a570db5cdb92d678836371134c31f1a9b78aa12f80bf785f88b420eccb11d642975193fb6d8e428035e25bc913acf3dad57ce2297b
-EBUILD emul-linux-x86-soundlibs-20140508.ebuild 2533 SHA256 f5ebc203b9d0540055c3329b01e3b6d99d40f40888080dd9de394d6cf2be8330 SHA512 42115301cfcc997b1c478579a9fb0089a135713bb85b4865c4b6676d348c260c0dab9f147da54c540735238a6d9f5f592bf1c61fc2b89726de9141266eef0356 WHIRLPOOL da8ace8edeae6980860e9021b67d9fd2a07ea7e287b4ee7c064c731e619d157660eed4facc8cf4695cbd22f97b3a2792d39baf30b078aaef0204ea15b492ce58
-MISC ChangeLog 23533 SHA256 8b73e603690c7d77f84735a809c40e71d6f877f7ebe2d15d0751fa9d1c290052 SHA512 fcc42d44447ed581be04b2345e36f0646b623a040888823d3104e7e5dac58b0c19ab7bdcf3ce8fbaa4af8167dcd465b2c53b2b533530bb1833018203b504eb44 WHIRLPOOL 3edbb415f742ab1dfbb5227f2b3543ac242c56c8755dd44a2a05133cb0a235857d74341b2fd8f3dd1c564f20a2744fe5368af635dc63a42e2592d5140e983c07
+EBUILD emul-linux-x86-soundlibs-20140508.ebuild 2595 SHA256 ce525df9033f37f5e2ed680982fa68b522763f3bf1ee30ba9b60818d2fc5d97e SHA512 6af248b8c9daf9260a02c7411df9e122abddf68e6f9df29b3c0f8068d31ec7fe261613d4b3e3cc9fc60e8b3ec32005d74965bca2fb4d6be2e0aeeb2bbc4d2db8 WHIRLPOOL a53dc3ab5a5729d1d2229750a39de9dce701b2cc89ec827adcb68cfa6fb844069989f4701e2d09ef581c344b87d81b10cbb865b4c127df7ce554ddd0e94bebf8
+MISC ChangeLog 23713 SHA256 26da0f2d79f3c1cd5f61bb0042532cf00fa332ae04eac5b4013240f36d1a5db8 SHA512 a621c1d31ca8071df93c1c1266fe9ec7624414585220657df45781debc146509def601730da86c774c7aeac377fa462adf9395d7714cf8d8c17e35efa9fde979 WHIRLPOOL 21494a401a60c31d08e06a427edb3a4c2c3f4400b4bfbb2d30a2e0ac61e47a722424b56558bd25c99773e46db68e59d622677fdc32abf521561abd5cdecd1f62
 MISC metadata.xml 393 SHA256 1c7a2ff2a63b40d4d163c62ec9b2a8734abefa33f9aa2fd514c51e62ba284a80 SHA512 ad676da46d237f6f3562a01055e935b4b5e04b95bf8b9e20a6b02562849627eac594d50146291c7434259440473b48bde16f4c5e985ef3ed7250275bfc47a6a6 WHIRLPOOL 2023a9f3b593d6f4d92f4e3a4fcc8e5ee4271911ebb1578323acb17b7e7e17230fcf3c342751bda7f9bcc149c956d169923d9f157e789eba3ccf03df374199a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQGcBAEBCAAGBQJTbSaYAAoJEJQzkH1pP7W49XUMAKYIETevPqWn+BaoHR/2M2xX
-0iDrPjNMPPwBQv1S/Hu60sh9LeenVgIwEaq9Shw7X4cJxKMQD1oNbU4p9otTkFVL
-phHkD5Kw+VuGZA7jyxPEpZHQanUTrmyL1haPj2VN34ElLohg5LmwLFdc6TA8GHPV
-a/588ZMQGsQQwrvFdfziXR/x3Vulq/i4Sn2Ta/1On0D5HUb/RgM22UYYkWbi4vRS
-zlE2+dNLRM6RBrpNOHNmxfa5gKSqkCcRVhK1yT1a8AjJX6twtemngGS2P2gdXtSv
-PIU4HYZJIYrTMGdphLxCYzA1lsia8MhTeVdqgX/VjmUNRmsumXThzuq3+b0y2JiP
-TK+evffYfdR9JQmETKFuxi94PhP6PKSfrjhlAdQGmW3aEe8W7SSYyJWnVFPnzsPX
-fd/LseSoM82j5poNQVbXyQbsF70Jtwwp5mLhC3ap2Y9/YXWxTUp40+591DLlP8No
-5L2PFh5Zlv4tlEXVFWBPhP6mE0eeXtrFvic+Rq0+aw==
-=vvmz
+iQJ8BAEBCABmBQJTbfovXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOm6IQAJW6MQx/9CQsuj0j+jf3ccV+
+Fr2sUQHCwt/cJxY+JIx7Z7RAqnNBPREtQwhIThtVyzbdY9I8Vflk4iqzy1iyKbMi
+UYUqUo3rSVe9w9gt3bLEHFudfdDMpMlkwXw7NNs8xa5Mpnzo5Q+PGmKomBezdeCO
+nmP/oXJeJqqJOSt0XjpBCpYtf8d0JX06+SE6Ca/MyH2I4xZk8NgG/KcJ3fJjuz01
+OgW3U4mZQX5AyvoWqqMIJAZpu61YMqJ8qp9LddDGXAyDxUV2mHXNiIL30HtOP9Pd
+N0n7rLaojjmRsTXdvz3HcHXpQr011fTM6p/qWW1iG8KU/mEnZn76TOPKJExPL3Cr
+FXU7cIoDvIi5bWDHZ1XH3IQ/OTgNgzgcwPBwyWJZc/soWEQ9hg40wyQo2oeJptaJ
+zhdGYlUm0svlcVDpuR45LxWGoEVw2CRHc2ZnBN4GEdwLr7aEzyQ7yyZkgwvHDV5l
+EqTCrm9oHKs0oZhkYwFmunruAc7Ts14ZUBosagmTXJoRmQEwY6MrJBN7FQWlZshS
+KYR5b68tHZU+5WvS8NfZqJUBAKjlmyzL1qUw+cx/SUhM9lElSX5iLUOvRAZpilWR
+CGIOu6yFdBBufLUj4mErA7SQaHZVd105/WHuKZH3Jnjo/+LheCregJLd33Zw7TK0
+kspMKqYkwAeT8nXKrfv5
+=r9nK
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406-r1.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406-r1.ebuild
index ece54f55195c..6a883082926d 100644
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406-r1.ebuild
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406-r1.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/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406-r1.ebuild,v 1.2 2014/05/09 19:03:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406-r1.ebuild,v 1.3 2014/05/10 10:06:35 mgorny Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -40,7 +40,10 @@ RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}[abi_x86_32=]
 		>=media-libs/libao-1.1.0-r1[abi_x86_32(-)]
 		>=media-libs/alsa-oss-1.0.25-r1[abi_x86_32(-)]
 		>=media-plugins/alsa-plugins-1.0.27-r2[abi_x86_32(-)]
-		>=net-wireless/bluez-5.18-r1[abi_x86_32(-)]
+		|| (
+			>=net-wireless/bluez-5.18-r1[abi_x86_32(-)]
+			=net-wireless/bluez-4.101-r9[abi_x86_32(-)]
+		)
 		pulseaudio? ( >=media-sound/pulseaudio-4.0-r1[abi_x86_32(-)] )
 	)"
 
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild
index 0c096a6a5b68..9524c5943ec4 100644
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.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/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild,v 1.3 2014/05/09 19:03:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild,v 1.4 2014/05/10 10:06:35 mgorny Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -40,7 +40,10 @@ RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}[abi_x86_32=]
 		>=media-libs/libao-1.1.0-r1[abi_x86_32(-)]
 		>=media-libs/alsa-oss-1.0.25-r1[abi_x86_32(-)]
 		>=media-plugins/alsa-plugins-1.0.27-r2[abi_x86_32(-)]
-		>=net-wireless/bluez-5.18-r1[abi_x86_32(-)]
+		|| (
+			>=net-wireless/bluez-5.18-r1[abi_x86_32(-)]
+			=net-wireless/bluez-4.101-r9[abi_x86_32(-)]
+		)
 		pulseaudio? ( >=media-sound/pulseaudio-4.0-r1[abi_x86_32(-)] )
 	)"