summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2014-08-30 17:27:14 +0000
committerUlrich Müller <ulm@gentoo.org>2014-08-30 17:27:14 +0000
commitdb05b8e42e34cb712bc3cfe4fb2aa679c8b220e3 (patch)
treefcb9620aac70108f8dc0e4048df8258e935af929 /net-im
parentStable on x86, bug #511984 (diff)
downloadgentoo-2-db05b8e42e34cb712bc3cfe4fb2aa679c8b220e3.tar.gz
gentoo-2-db05b8e42e34cb712bc3cfe4fb2aa679c8b220e3.tar.bz2
gentoo-2-db05b8e42e34cb712bc3cfe4fb2aa679c8b220e3.zip
Depend on 32-bit pulseaudio, bug 518922.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'net-im')
-rw-r--r--net-im/skype/ChangeLog5
-rw-r--r--net-im/skype/skype-4.3.0.37.ebuild11
2 files changed, 11 insertions, 5 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index 89eda745e2ba..e6b98c3e1d95 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,9 @@
# 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.159 2014/08/30 15:30:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.160 2014/08/30 17:27:14 ulm Exp $
+
+ 30 Aug 2014; Ulrich Müller <ulm@gentoo.org> skype-4.3.0.37.ebuild:
+ Depend on 32-bit pulseaudio, bug 518922.
30 Aug 2014; Michał Górny <mgorny@gentoo.org>
-files/skype-4.2.0.11-desktop.patch, -files/skype-4.2.0.13-desktop.patch,
diff --git a/net-im/skype/skype-4.3.0.37.ebuild b/net-im/skype/skype-4.3.0.37.ebuild
index c551ea7a5779..70671b3e921a 100644
--- a/net-im/skype/skype-4.3.0.37.ebuild
+++ b/net-im/skype/skype-4.3.0.37.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.ebuild,v 1.2 2014/06/19 19:20:13 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.3.0.37.ebuild,v 1.3 2014/08/30 17:27:14 ulm Exp $
EAPI=5
@@ -10,13 +10,13 @@ DESCRIPTION="P2P Internet Telephony (VoiceIP) client"
HOMEPAGE="http://www.skype.com/"
SRC_URI="http://download.${PN}.com/linux/${P}.tar.bz2"
-LICENSE="${PN}-4.0.0.7-copyright ${PN}-4.0.0.7-third-party_attributions.txt"
+LICENSE="skype-4.0.0.7-copyright skype-4.0.0.7-third-party_attributions.txt"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="pax_kernel +pulseaudio selinux"
QA_PREBUILT=opt/bin/${PN}
-RESTRICT="mirror strip" #299368
+RESTRICT="mirror bindist strip" #299368
EMUL_X86_VER=20120520
@@ -33,7 +33,10 @@ RDEPEND="
>=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER}
)
|| (
- media-libs/alsa-lib[abi_x86_32(-)]
+ (
+ media-libs/alsa-lib[abi_x86_32(-)]
+ pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] )
+ )
>=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}
)
|| (