removing version 0.90.0.3 and adding 0.90.0.4

6 files changed, 21 insertions, 14 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index 46f09d50e4d6..30009837f55e 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,13 @@
 # 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.3 2004/06/22 16:06:15 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.4 2004/06/24 13:59:24 humpback Exp $
+
+*skype-0.90.0.4 (24 Jun 2004)
+
+  24 Jun 2004; Gustavo Felisberto <humpback@gentoo.org>; -files/artsskype,
+  +files/sDaemonWrapper, -skype-0.90.0.3.ebuild, +skype-0.90.0.4.ebuild:
+  Removing version 0.90.0.3 and adding 0.90.0.4 report problems in bug
+  http://bugs.gentoo.org/show_bug.cgi?id=54665
 
   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 939d608c91d7..ce4b25c0985a 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -1,5 +1,5 @@
-MD5 7195d77aebe91978fe0f6150c4956128 skype-0.90.0.3.ebuild 1951
 MD5 f05eba693923cfb1455383da06536323 metadata.xml 492
-MD5 74b88ee8f317d97bf4a7062fe37131f8 ChangeLog 690
-MD5 5b5a95765f789de78e551a942c48d452 files/digest-skype-0.90.0.3 153
-MD5 08bd227b8adf1ab9557d7ede2dfd24a2 files/artsskype 993
+MD5 88c6c0c6890174938e1cd06d371b2bd1 ChangeLog 988
+MD5 dc0f30220dc26c47fe759e42840c05c9 skype-0.90.0.4.ebuild 1970
+MD5 88f7b71eada401aa0cbb0626b83a2d02 files/digest-skype-0.90.0.4 153
+MD5 09e9a966baffc32faad3097fd678820e files/sDaemonWrapper 995
diff --git a/net-im/skype/files/digest-skype-0.90.0.3 b/net-im/skype/files/digest-skype-0.90.0.3
deleted file mode 100644
index f1d26d97de0f..000000000000
--- a/net-im/skype/files/digest-skype-0.90.0.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 60f4d878a5fddebb2d744822833a5697 skype_ver-0_90_0_3.tar.bz2 3256890
-MD5 c3b853ebca6501dfbaa04cc37c620ac4 skype_ver-0_90_0_3-staticQT.tar.bz2 5650176
diff --git a/net-im/skype/files/digest-skype-0.90.0.4 b/net-im/skype/files/digest-skype-0.90.0.4
new file mode 100644
index 000000000000..9ac243cccad1
--- /dev/null
+++ b/net-im/skype/files/digest-skype-0.90.0.4
@@ -0,0 +1,2 @@
+MD5 4a7bcb13a1a9681552a86c3e34eae789 skype_ver-0_90_0_4.tar.bz2 3266028
+MD5 2343cc3ae7b73325134cc51482dd83d6 skype_ver-0_90_0_4-staticQT.tar.bz2 5693856
diff --git a/net-im/skype/files/artsskype b/net-im/skype/files/sDaemonWrapper
index dc245566deb3..c9d0cbba4fb8 100644
--- a/net-im/skype/files/artsskype
+++ b/net-im/skype/files/sDaemonWrapper
@@ -4,7 +4,7 @@ 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} ]]
 then
diff --git a/net-im/skype/skype-0.90.0.3.ebuild b/net-im/skype/skype-0.90.0.4.ebuild
index a7ee53e10fa5..449859b01d2e 100644
--- a/net-im/skype/skype-0.90.0.3.ebuild
+++ b/net-im/skype/skype-0.90.0.4.ebuild
@@ -1,8 +1,10 @@
 # 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.3 2004/06/22 16:06:15 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-0.90.0.4.ebuild,v 1.1 2004/06/24 13:59:24 humpback Exp $
 
-SVER="0_90_0_3"
+inherit eutils
+
+SVER=${PV//./_}
 RESTRICT="fetch"
 DESCRIPTION="${PN} is a P2P-VoiceIP client."
 HOMEPAGE="http://www.${PN}.com/"
@@ -48,7 +50,7 @@ src_install() {
 	if ( use arts  ||  use esd );
 	then
 		mv skype skype.bin
-		cp ${FILESDIR}/artsskype skype
+		cp ${FILESDIR}/sDaemonWrapper skype
 	fi
 
 	dodir /opt/skype
@@ -58,9 +60,7 @@ src_install() {
 	( use arts || use esd ) && doexe skype.bin
 	insinto /opt/skype
 	doins call_in.wav
-	dodir /usr/share/applnk/Internet
-	insinto /usr/share/applnk/Internet
-	doins skype.desktop
+	make_desktop_entry skype "Skype VoIP" ../icons/hicolor/48x48/apps/skype.png "Telephony"
 	for SIZE in 16 24 32 48
 	do
 		mkdir ${S}/icons/${SIZE}