diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-05-10 10:06:35 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-05-10 10:06:35 +0000 |
| commit | eb171e8b81e84d89bb154380fc0769556e1cd1ef (patch) | |
| tree | 667d518f88f272efda21e8bce6b384dadfd24ead /app-emulation/emul-linux-x86-soundlibs | |
| parent | Bumping to 1.9_pre20140422 and seperating patch into upstream and non-upstrea... (diff) | |
| download | gentoo-2-eb171e8b81e84d89bb154380fc0769556e1cd1ef.tar.gz gentoo-2-eb171e8b81e84d89bb154380fc0769556e1cd1ef.tar.bz2 gentoo-2-eb171e8b81e84d89bb154380fc0769556e1cd1ef.zip | |
Accept multilib bluez-4 as well.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'app-emulation/emul-linux-x86-soundlibs')
3 files changed, 16 insertions, 5 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/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(-)] ) )" |