diff options
author | Ulrich Müller <ulm@gentoo.org> | 2014-10-08 19:48:23 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2014-10-08 19:48:23 +0000 |
commit | aa21950cf7ac3ffcd6f491169536a11f07a79d55 (patch) | |
tree | 9d64751da1632a0fe1ca4b7c62e48f8f8d7a9072 /net-im | |
parent | updating for new release, fixes bug 522360 (diff) | |
download | gentoo-2-aa21950cf7ac3ffcd6f491169536a11f07a79d55.tar.gz gentoo-2-aa21950cf7ac3ffcd6f491169536a11f07a79d55.tar.bz2 gentoo-2-aa21950cf7ac3ffcd6f491169536a11f07a79d55.zip |
USE-conditional depend on apulse only for multilib soundlibs, bug 524164 comment 5.
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/skype/ChangeLog | 6 | ||||
-rw-r--r-- | net-im/skype/skype-4.3.0.37-r1.ebuild | 18 |
2 files changed, 10 insertions, 14 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index b7c64f24b893..f75231fab27e 100644 --- a/net-im/skype/ChangeLog +++ b/net-im/skype/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/skype # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.163 2014/10/05 09:45:54 jauhien Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.164 2014/10/08 19:48:23 ulm Exp $ + + 08 Oct 2014; Ulrich Müller <ulm@gentoo.org> skype-4.3.0.37-r1.ebuild: + USE-conditional depend on apulse only for multilib soundlibs, bug 524164 + comment 5. *skype-4.3.0.37-r1 (05 Oct 2014) diff --git a/net-im/skype/skype-4.3.0.37-r1.ebuild b/net-im/skype/skype-4.3.0.37-r1.ebuild index 540bd119375c..99739adcb641 100644 --- a/net-im/skype/skype-4.3.0.37-r1.ebuild +++ b/net-im/skype/skype-4.3.0.37-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/net-im/skype/skype-4.3.0.37-r1.ebuild,v 1.1 2014/10/05 09:45:54 jauhien Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.3.0.37-r1.ebuild,v 1.2 2014/10/08 19:48:23 ulm Exp $ EAPI=5 @@ -31,9 +31,7 @@ RDEPEND=" dev-qt/qtgui:4[accessibility,abi_x86_32(-)] dev-qt/qtwebkit:4[abi_x86_32(-)] ) - !apulse? ( - >=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER} - ) + >=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER} ) || ( ( @@ -51,13 +49,9 @@ RDEPEND=" x11-libs/libXScrnSaver[abi_x86_32(-)] x11-libs/libXv[abi_x86_32(-)] ) - !apulse? ( - >=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER} - ) - ) - apulse? ( - media-sound/apulse[abi_x86_32(-)] + >=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER} ) + apulse? ( media-sound/apulse[abi_x86_32(-)] ) ) x86? ( media-libs/alsa-lib @@ -69,9 +63,7 @@ RDEPEND=" dev-qt/qtdbus:4 dev-qt/qtgui:4[accessibility] dev-qt/qtwebkit:4 - apulse? ( - media-sound/apulse - ) + apulse? ( media-sound/apulse ) ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-skype )" |