diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-10-17 18:32:40 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-10-17 18:32:40 +0000 |
| commit | 514b6f6334417359dedb75c760d3e055bd4b6b5c (patch) | |
| tree | 41fc5e4c0e1d81141d39d8f135368db98db65bdf /net-im | |
| parent | Version bump. (diff) | |
| download | gentoo-2-514b6f6334417359dedb75c760d3e055bd4b6b5c.tar.gz gentoo-2-514b6f6334417359dedb75c760d3e055bd4b6b5c.tar.bz2 gentoo-2-514b6f6334417359dedb75c760d3e055bd4b6b5c.zip | |
Do not require -abi_x86_32 on emul-linux to simplify installing. It does not matter anyway.
(Portage version: 2.2.7/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 | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index af724a64baa8..510c1b2f7075 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.152 2013/09/18 22:01:30 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.153 2013/10/17 18:32:40 mgorny Exp $ + + 17 Oct 2013; Michał Górny <mgorny@gentoo.org> skype-4.2.0.11-r1.ebuild: + Do not require -abi_x86_32 on emul-linux to simplify installing. It does not + matter anyway. 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 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 8b589e5fc8f8..276d8e9855a5 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.3 2013/09/18 22:01:30 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.2.0.11-r1.ebuild,v 1.4 2013/10/17 18:32:40 mgorny Exp $ EAPI=5 inherit eutils gnome2-utils pax-utils @@ -28,11 +28,11 @@ RDEPEND="virtual/ttf-fonts 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(-)] + >=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER} ) || ( media-libs/alsa-lib[abi_x86_32(-)] - >=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}[-abi_x86_32(-)] + >=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER} ) || ( ( @@ -41,7 +41,7 @@ RDEPEND="virtual/ttf-fonts x11-libs/libXScrnSaver[abi_x86_32(-)] x11-libs/libXv[abi_x86_32(-)] ) - >=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}[-abi_x86_32(-)] + >=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER} ) ) x86? ( |