summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Felisberto <humpback@gentoo.org>2004-06-22 16:06:15 +0000
committerGustavo Felisberto <humpback@gentoo.org>2004-06-22 16:06:15 +0000
commitbe3f410742da61396115404332bb676dd7cc4440 (patch)
treeb3c6c4bff7ac5130022ec5f03b209515c3161be3 /net-im/skype
parentVersion bumped, thanks to Lars Bernhardsson <lab@fnurt.net> in bug #54247 (diff)
downloadhistorical-be3f410742da61396115404332bb676dd7cc4440.tar.gz
historical-be3f410742da61396115404332bb676dd7cc4440.tar.bz2
historical-be3f410742da61396115404332bb676dd7cc4440.zip
Small updates
Diffstat (limited to 'net-im/skype')
-rw-r--r--net-im/skype/ChangeLog6
-rw-r--r--net-im/skype/Manifest6
-rw-r--r--net-im/skype/files/artsskype4
-rw-r--r--net-im/skype/skype-0.90.0.3.ebuild8
4 files changed, 14 insertions, 10 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/Manifest b/net-im/skype/Manifest
index 4d3aa558eaf3..939d608c91d7 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -1,5 +1,5 @@
-MD5 a367c405fcb2f5e4d88cc4036c936cec skype-0.90.0.3.ebuild 1916
+MD5 7195d77aebe91978fe0f6150c4956128 skype-0.90.0.3.ebuild 1951
MD5 f05eba693923cfb1455383da06536323 metadata.xml 492
-MD5 35d038d4b651c668ed6cfce4ff251288 ChangeLog 550
+MD5 74b88ee8f317d97bf4a7062fe37131f8 ChangeLog 690
MD5 5b5a95765f789de78e551a942c48d452 files/digest-skype-0.90.0.3 153
-MD5 8a4fc376b937d0e6ac2c0b62884ee99a files/artsskype 991
+MD5 08bd227b8adf1ab9557d7ede2dfd24a2 files/artsskype 993
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