diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-09-18 22:01:30 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-09-18 22:01:30 +0000 |
| commit | cd70ad0a543efa30154f6e5d6e5e24230cc1f2c2 (patch) | |
| tree | 98862b383d6c278753ebd8df0234f1e597913111 /net-im | |
| parent | Add unit file (#484936 by Andrius Štikonas) (diff) | |
| download | gentoo-2-cd70ad0a543efa30154f6e5d6e5e24230cc1f2c2.tar.gz gentoo-2-cd70ad0a543efa30154f6e5d6e5e24230cc1f2c2.tar.bz2 gentoo-2-cd70ad0a543efa30154f6e5d6e5e24230cc1f2c2.zip | |
Support both emul-linux and multilib dependencies. Bug #485330 with patch from Michael "iamnr3" Mair-Keimberger.
(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/skype/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/skype/skype-4.2.0.11-r1.ebuild | 30 |
2 files changed, 25 insertions, 11 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index d9baedb429a8..af724a64baa8 100644 --- a/net-im/skype/ChangeLog +++ b/net-im/skype/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/skype # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.151 2013/09/08 21:17:44 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.152 2013/09/18 22:01:30 mgorny Exp $ + + 18 Sep 2013; Michał Górny <mgorny@gentoo.org> skype-4.2.0.11-r1.ebuild: + Support both emul-linux and multilib dependencies. Bug #485330 with patch from + Michael "iamnr3" Mair-Keimberger. 08 Sep 2013; Maciej Mrozowski <reavertm@gentoo.org> skype-2.2.0.35-r99.ebuild, skype-4.0.0.8-r1.ebuild, skype-4.1.0.20.ebuild, skype-4.2.0.11-r1.ebuild, diff --git a/net-im/skype/skype-4.2.0.11-r1.ebuild b/net-im/skype/skype-4.2.0.11-r1.ebuild index 49d5f538636c..8b589e5fc8f8 100644 --- a/net-im/skype/skype-4.2.0.11-r1.ebuild +++ b/net-im/skype/skype-4.2.0.11-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.2.0.11-r1.ebuild,v 1.2 2013/09/08 21:17:44 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.2.0.11-r1.ebuild,v 1.3 2013/09/18 22:01:30 mgorny Exp $ EAPI=5 inherit eutils gnome2-utils pax-utils @@ -21,20 +21,30 @@ EMUL_X86_VER=20120520 RDEPEND="virtual/ttf-fonts amd64? ( - >=app-emulation/emul-linux-x86-baselibs-${EMUL_X86_VER} - >=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER} - >=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER} || ( ( - x11-libs/libX11[abi_x86_32] - x11-libs/libXext[abi_x86_32] - x11-libs/libXScrnSaver[abi_x86_32] - x11-libs/libXv[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(-)] ) - >=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER} + >=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(-)] ) ) - !amd64? ( + x86? ( media-libs/alsa-lib x11-libs/libX11 x11-libs/libXext |