diff options
| author |   Timothy Redaelli <drizzt@gentoo.org> | 2007-05-24 09:51:21 +0000 |
|---|---|---|
| committer | Timothy Redaelli <drizzt@gentoo.org> | 2007-05-24 09:51:21 +0000 |
| commit | 147a07e944dde70fc2aacad93c07b0a3b4ac4a56 (patch) | |
| tree | 074574f6ac09ee07369f0a17c18ef15ca322204e /net-im | |
| parent | Stable on ppc; bug #170899. (diff) | |
| download | gentoo-2-147a07e944dde70fc2aacad93c07b0a3b4ac4a56.tar.gz gentoo-2-147a07e944dde70fc2aacad93c07b0a3b4ac4a56.tar.bz2 gentoo-2-147a07e944dde70fc2aacad93c07b0a3b4ac4a56.zip | |
Add a ugly hack wrt bug #179568.
Tested under ~amd64 and ~x86.
(Portage version: 2.1.2.7)
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/skype/ChangeLog | 7 | ||||
| -rw-r--r-- | net-im/skype/files/99skype | 1 | ||||
| -rw-r--r-- | net-im/skype/skype-1.4.0.64_alpha.ebuild | 22 |
3 files changed, 16 insertions, 14 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index ec25314fa4ee..ad4dfdd0e6c6 100644 --- a/net-im/skype/ChangeLog +++ b/net-im/skype/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-im/skype # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.71 2007/05/23 17:02:52 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.72 2007/05/24 09:51:21 drizzt Exp $ + + 24 May 2007; Timothy Redaelli <drizzt@gentoo.org> -files/99skype, + skype-1.4.0.64_alpha.ebuild: + Add a ugly hack wrt bug #179568. + Tested under ~amd64 and ~x86. 23 May 2007; Timothy Redaelli <drizzt@gentoo.org> skype-1.4.0.64_alpha.ebuild: diff --git a/net-im/skype/files/99skype b/net-im/skype/files/99skype deleted file mode 100644 index 91bc0f4a4a2c..000000000000 --- a/net-im/skype/files/99skype +++ /dev/null @@ -1 +0,0 @@ -LDPATH=/opt/skype diff --git a/net-im/skype/skype-1.4.0.64_alpha.ebuild b/net-im/skype/skype-1.4.0.64_alpha.ebuild index 80c0dfc90271..cf4baa7e2052 100644 --- a/net-im/skype/skype-1.4.0.64_alpha.ebuild +++ b/net-im/skype/skype-1.4.0.64_alpha.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.4.0.64_alpha.ebuild,v 1.2 2007/05/23 17:02:52 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.4.0.64_alpha.ebuild,v 1.3 2007/05/24 09:51:21 drizzt Exp $ inherit eutils qt4 @@ -30,8 +30,8 @@ DEPEND=" >=media-libs/alsa-lib-1.0.11 >=dev-libs/libsigc++-2 !static? ( $(qt4_min_version 4.2.3) ) )" -#RDEPEND="${DEPEND} -# >=sys-apps/dbus-0.23.4" +RDEPEND="${DEPEND} + >=sys-apps/dbus-1.0.0" QA_EXECSTACK_x86="opt/skype/skype" QA_EXECSTACK_amd64="opt/skype/skype" @@ -76,8 +76,7 @@ src_install() { exeopts -m0755 exeinto /opt/${PN} doexe skype - doexe ${FILESDIR}/skype.sh - dosym /opt/skype/skype.sh /usr/bin/skype + make_wrapper skype /opt/${PN}/skype /opt/${PN} /opt/${PN} /usr/bin #doexe skype-callto-handler insinto /opt/${PN}/sounds @@ -119,19 +118,18 @@ src_install() { # Install the Documentation #dodoc README LICENSE - make_desktop_entry skype "Skype VoIP" skype #AMD64 team does not provide this so we add it: - if use amd64; - then - cd ${WORKDIR} + if use amd64; then exeinto /opt/${PN} - doexe libsigc-2.0.so.0 - doexe libsigc-2.0.so.0.0.0 - doenvd "${FILESDIR}"/99skype + dosym libsigc-2.0.so.0.0.0 /opt/${PN}/libsigc-2.0.so.0 + doexe "${WORKDIR}"/libsigc-2.0.so.0.0.0 fi + #Ugly hack for bug #179568 + use amd64 && multilib_toolchain_setup x86 + dosym /usr/$(get_libdir)/libdbus-1.so /opt/${PN}/libdbus-1.so.2 # TODO: Optional configuration of callto:// in KDE, Mozilla and friends } |