diff options
| author |   Amy Liffey <amynka@gentoo.org> | 2015-06-14 11:22:59 +0000 |
|---|---|---|
| committer | Amy Liffey <amynka@gentoo.org> | 2015-06-14 11:22:59 +0000 |
| commit | 08b50ebbfbf5d7ee328b423b93dcfd3633b7c664 (patch) | |
| tree | 11b2d6f54cc8463132ad3206cb53e0cf5921326c /net-im | |
| parent | Backport busy CPU loop on a poll(), bug #549732 by Joakim Tjernlund and Shiba. (diff) | |
| download | gentoo-2-08b50ebbfbf5d7ee328b423b93dcfd3633b7c664.tar.gz gentoo-2-08b50ebbfbf5d7ee328b423b93dcfd3633b7c664.tar.bz2 gentoo-2-08b50ebbfbf5d7ee328b423b93dcfd3633b7c664.zip | |
Removed emul from dependencies
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 34E69781)
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/skype/ChangeLog | 7 | ||||
| -rw-r--r-- | net-im/skype/skype-4.3.0.37-r5.ebuild | 42 |
2 files changed, 18 insertions, 31 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index 020990b58008..a80ef44c8f59 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.172 2014/12/14 11:15:17 ulm Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.173 2015/06/14 11:22:59 amynka Exp $ + + 14 Jun 2015; <amy@gentoo.org> skype-4.3.0.37-r5.ebuild: + Removed emul from dependencies 14 Dec 2014; Ulrich Müller <ulm@gentoo.org> files/skype: Pass arguments through the wrapper script, thanks to Martin Väth diff --git a/net-im/skype/skype-4.3.0.37-r5.ebuild b/net-im/skype/skype-4.3.0.37-r5.ebuild index 3a09cb1b12ad..cc27d8228661 100644 --- a/net-im/skype/skype-4.3.0.37-r5.ebuild +++ b/net-im/skype/skype-4.3.0.37-r5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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-r5.ebuild,v 1.2 2014/12/14 10:30:17 amynka Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.3.0.37-r5.ebuild,v 1.3 2015/06/14 11:22:59 amynka Exp $ EAPI=5 @@ -24,32 +24,16 @@ EMUL_X86_VER=20120520 RDEPEND=" virtual/ttf-fonts amd64? ( - || ( - ( - dev-qt/qtcore:4[abi_x86_32(-)] - dev-qt/qtdbus:4[abi_x86_32(-)] - dev-qt/qtgui:4[accessibility,abi_x86_32(-)] - dev-qt/qtwebkit:4[abi_x86_32(-)] - ) - >=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER}[-abi_x86_32(-)] - ) - || ( - media-libs/alsa-lib[abi_x86_32(-)] - >=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}[-abi_x86_32(-)] - ) - || ( - ( - x11-libs/libX11[abi_x86_32(-)] - x11-libs/libXext[abi_x86_32(-)] - x11-libs/libXScrnSaver[abi_x86_32(-)] - x11-libs/libXv[abi_x86_32(-)] - ) - >=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}[-abi_x86_32(-)] - ) - pulseaudio? ( || ( - media-sound/pulseaudio[abi_x86_32(-)] - >=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}[-abi_x86_32(-)] - ) ) + dev-qt/qtcore:4[abi_x86_32(-)] + dev-qt/qtdbus:4[abi_x86_32(-)] + dev-qt/qtgui:4[accessibility,abi_x86_32(-)] + dev-qt/qtwebkit:4[abi_x86_32(-)] + media-libs/alsa-lib[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXScrnSaver[abi_x86_32(-)] + x11-libs/libXv[abi_x86_32(-)] + pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] ) apulse? ( media-sound/apulse[abi_x86_32(-)] ) ) x86? ( @@ -136,7 +120,7 @@ pkg_postinst() { elog "For webcam support, see \"LD_PRELOAD\" section of \"README.lib\" document provided by" elog "media-libs/libv4l package and \"README\" document of this package." if use amd64; then - elog "You can install app-emulation/emul-linux-x86-medialibs package for the 32bit" + elog "You can't install app-emulation/emul-linux-x86-medialibs package for the 32bit" elog "libraries from the media-libs/libv4l package." fi |