summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2014-11-10 22:39:17 +0000
committerIan Stakenvicius <axs@gentoo.org>2014-11-10 22:39:17 +0000
commit6baaa71c8208985c6a5b1cf79d14034eff41a09c (patch)
tree968eba8e695020de82510ca1577621bb0b620620 /net-im/skype
parentadd ability to install with the help of emul-* packages, to support stable-am... (diff)
downloadgentoo-2-6baaa71c8208985c6a5b1cf79d14034eff41a09c.tar.gz
gentoo-2-6baaa71c8208985c6a5b1cf79d14034eff41a09c.tar.bz2
gentoo-2-6baaa71c8208985c6a5b1cf79d14034eff41a09c.zip
adjusted deps related to emul-*-soundlibs and apulse for better amd64-stable compatibility
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Diffstat (limited to 'net-im/skype')
-rw-r--r--net-im/skype/ChangeLog9
-rw-r--r--net-im/skype/skype-4.3.0.37-r2.ebuild (renamed from net-im/skype/skype-4.3.0.37-r1.ebuild)15
2 files changed, 15 insertions, 9 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index f75231fab27e..6658cb3e0428 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,13 @@
# 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.164 2014/10/08 19:48:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.165 2014/11/10 22:39:17 axs Exp $
+
+*skype-4.3.0.37-r2 (10 Nov 2014)
+
+ 10 Nov 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+ +skype-4.3.0.37-r2.ebuild, -skype-4.3.0.37-r1.ebuild:
+ adjusted deps related to emul-*-soundlibs and apulse for better amd64-stable
+ compatibility
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
diff --git a/net-im/skype/skype-4.3.0.37-r1.ebuild b/net-im/skype/skype-4.3.0.37-r2.ebuild
index 99739adcb641..b36d4b690e68 100644
--- a/net-im/skype/skype-4.3.0.37-r1.ebuild
+++ b/net-im/skype/skype-4.3.0.37-r2.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.2 2014/10/08 19:48:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.3.0.37-r2.ebuild,v 1.1 2014/11/10 22:39:17 axs Exp $
EAPI=5
@@ -34,13 +34,8 @@ RDEPEND="
>=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER}
)
|| (
- (
- media-libs/alsa-lib[abi_x86_32(-)]
- pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] )
- )
- !apulse? (
- >=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}
- )
+ media-libs/alsa-lib[abi_x86_32(-)]
+ >=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}
)
|| (
(
@@ -51,6 +46,10 @@ RDEPEND="
)
>=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}
)
+ pulseaudio? ( || (
+ media-sound/pulseaudio[abi_x86_32(-)]
+ >=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}[pulseaudio]
+ ) )
apulse? ( media-sound/apulse[abi_x86_32(-)] )
)
x86? (