diff options
| author |   Gustavo Felisberto <humpback@gentoo.org> | 2004-06-22 16:06:15 +0000 |
|---|---|---|
| committer | Gustavo Felisberto <humpback@gentoo.org> | 2004-06-22 16:06:15 +0000 |
| commit | fcb1130c8d74f585170507d061c720419d37c6c2 (patch) | |
| tree | 39c6b8098ec9cd1a6e35ddad5163d12119957d87 /net-im | |
| parent | Version bumped, thanks to Lars Bernhardsson <lab@fnurt.net> in bug #54247 (Ma... (diff) | |
| download | gentoo-2-fcb1130c8d74f585170507d061c720419d37c6c2.tar.gz gentoo-2-fcb1130c8d74f585170507d061c720419d37c6c2.tar.bz2 gentoo-2-fcb1130c8d74f585170507d061c720419d37c6c2.zip | |
Small updates
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/skype/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/skype/files/artsskype | 4 | ||||
| -rw-r--r-- | net-im/skype/skype-0.90.0.3.ebuild | 8 |
3 files changed, 11 insertions, 7 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index 657bffeb8ea1..46f09d50e4d6 100644 --- a/net-im/skype/ChangeLog +++ b/net-im/skype/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/skype # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.2 2004/06/22 11:29:32 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.3 2004/06/22 16:06:15 humpback Exp $ + + 22 Jun 2004; Gustavo Felisberto <humpback@gentoo.org>; + skype-0.90.0.3.ebuild, files/artsskype: + Small fixes in usahe of use vars :) . 22 Jun 2004; Gustavo Felisberto <humpback@gentoo.org>; skype-0.90.0.3.ebuild, files/artsskype: diff --git a/net-im/skype/files/artsskype b/net-im/skype/files/artsskype index adb11aebe4c0..dc245566deb3 100644 --- a/net-im/skype/files/artsskype +++ b/net-im/skype/files/artsskype @@ -4,9 +4,9 @@ progpath="/opt/${progname}/" shellcheck1=` which artsshell 2> /dev/null ` shellcheck2=` which esd 2> /dev/null ` artsdcheck=` ps x | grep artsd | grep -v grep ` -esdcheck=` ps x | grep esd | grep -v grep ` +esdcheck=` ps -x | grep esd$ | grep -v grep ` -if [[ -z ${shellcheck1} || -z ${shellcheck2} ]] +if [[ -z ${shellcheck1} && -z ${shellcheck2} ]] then echo "No installed artsshell or esd found" echo "Assuming you're running no sound daemon" diff --git a/net-im/skype/skype-0.90.0.3.ebuild b/net-im/skype/skype-0.90.0.3.ebuild index baf9fe798660..a7ee53e10fa5 100644 --- a/net-im/skype/skype-0.90.0.3.ebuild +++ b/net-im/skype/skype-0.90.0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-0.90.0.3.ebuild,v 1.2 2004/06/22 11:29:32 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-0.90.0.3.ebuild,v 1.3 2004/06/22 16:06:15 humpback Exp $ SVER="0_90_0_3" RESTRICT="fetch" @@ -27,7 +27,7 @@ pkg_nofetch() { fi einfo "and copy it to ${DISTDIR}" einfo "" - einfo "Have a look at ${PORTDIR}/licenses/${PN} before running this software" + einfo "Have a look at ${PORTDIR}/licenses/${LICENSE} before running this software" } src_unpack() { @@ -55,7 +55,7 @@ src_install() { exeopts -m0755 exeinto /opt/skype doexe skype - use arts && doexe skype.bin + ( use arts || use esd ) && doexe skype.bin insinto /opt/skype doins call_in.wav dodir /usr/share/applnk/Internet @@ -69,7 +69,7 @@ src_install() { insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps doins ${S}/icons/${SIZE}/${PN}.png done - use arts && fowners root:audio /opt/skype/skype.bin + ( use arts || use esd ) && fowners root:audio /opt/skype/skype.bin fowners root:audio /opt/skype/skype dodir /usr/bin/ dosym /opt/skype/skype /usr/bin/skype |