diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-01-06 16:39:51 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-01-06 16:39:51 +0000 |
| commit | e1ee36df9910868d31dfab7490715c7efc752731 (patch) | |
| tree | ddc760c1ef16b4a6d63ba77135e24e8e8e8d8754 /net-im/skype | |
| parent | Stable for HPPA (bug #299317). (diff) | |
| download | gentoo-2-e1ee36df9910868d31dfab7490715c7efc752731.tar.gz gentoo-2-e1ee36df9910868d31dfab7490715c7efc752731.tar.bz2 gentoo-2-e1ee36df9910868d31dfab7490715c7efc752731.zip | |
Restricting "strip" again wrt #299368.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'net-im/skype')
| -rw-r--r-- | net-im/skype/ChangeLog | 8 | ||||
| -rw-r--r-- | net-im/skype/skype-2.1.0.47-r1.ebuild (renamed from net-im/skype/skype-2.1.0.47.ebuild) | 15 |
2 files changed, 15 insertions, 8 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index 3013f8f0b1bd..09da8754eaa5 100644 --- a/net-im/skype/ChangeLog +++ b/net-im/skype/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/skype # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.105 2010/01/02 12:24:15 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.106 2010/01/06 16:39:51 ssuominen Exp $ + +*skype-2.1.0.47-r1 (06 Jan 2010) + + 06 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> + +skype-2.1.0.47-r1.ebuild: + Restricting "strip" again wrt #299368. 02 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> skype-2.1.0.47.ebuild: Use shipped skype.conf instead of one from FILESDIR. diff --git a/net-im/skype/skype-2.1.0.47.ebuild b/net-im/skype/skype-2.1.0.47-r1.ebuild index 0f22910601dc..331b3e3cc94f 100644 --- a/net-im/skype/skype-2.1.0.47.ebuild +++ b/net-im/skype/skype-2.1.0.47-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.1.0.47.ebuild,v 1.3 2010/01/02 12:24:15 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.1.0.47-r1.ebuild,v 1.1 2010/01/06 16:39:51 ssuominen Exp $ EAPI=2 @@ -18,7 +18,9 @@ LICENSE="skype-eula" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="qt-static" -RESTRICT="mirror" + +# http://bugs.gentoo.org/show_bug.cgi?id=299368 +RESTRICT="mirror strip" EMUL_VER=20091231 @@ -26,8 +28,7 @@ RDEPEND="amd64? ( >=app-emulation/emul-linux-x86-xlibs-${EMUL_VER} >=app-emulation/emul-linux-x86-baselibs-${EMUL_VER} >=app-emulation/emul-linux-x86-soundlibs-${EMUL_VER} !qt-static? ( >=app-emulation/emul-linux-x86-qtlibs-${EMUL_VER} ) ) - x86? ( >=sys-libs/glibc-2.4 - >=media-libs/alsa-lib-1.0.11 + x86? ( >=media-libs/alsa-lib-1.0.11 x11-libs/libXScrnSaver x11-libs/libXv qt-static? ( media-libs/fontconfig @@ -47,9 +48,9 @@ RDEPEND="amd64? ( >=app-emulation/emul-linux-x86-xlibs-${EMUL_VER} x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) )" -# Required for lrelease command. -DEPEND="${RDEPEND} - amd64? ( !qt-static? ( x11-libs/qt-core:4 ) )" + +# Required for lrelease command at buildtime +DEPEND="!qt-static? ( x11-libs/qt-core:4 )" QA_EXECSTACK="opt/skype/skype" QA_WX_LOAD="opt/skype/skype" |