change to wrapper script

(Portage version: 2.0.51.22-r1)

5 files changed, 175 insertions, 12 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index 18d28acb8d2a..27c2b1661cb0 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/skype
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.40 2005/07/07 16:51:13 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.41 2005/07/10 14:04:18 humpback Exp $
+
+*skype-1.1.0.20-r1 (10 Jul 2005)
+
+  10 Jul 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/sDaemonWrapper-r1, +skype-1.1.0.20-r1.ebuild:
+  Added change to wrapper script to try to run with no arts/esd in case of
+  fail. Thanks to ph in bug #97345.
 
 *skype-1.1.0.20 (07 Jul 2005)
 
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index 9474e448deef..f9b4e02ba5b4 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a7a1cbf3e78ee29cd8db8e39da1a5f8a skype-1.1.0.20.ebuild 2976
 MD5 f55d394958fdb3e8c4fd6ed911836b2c skype-1.1.0.13.ebuild 2977
+MD5 72037a2a89e7a5cd749ecedd1b3aac72 skype-1.1.0.20-r1.ebuild 2979
 MD5 8529ca7d83fe1dc0add402e4ba4972c2 skype-1.1.0.3.ebuild 2752
 MD5 0a7ebb2b6a4d7e9a01f898a2c707a1c2 skype-1.1.0.3-r1.ebuild 2834
-MD5 a673a30b570bd414ae3d4483932f788b ChangeLog 7620
+MD5 518df19dc89c4e41a4c894fb64a730e8 ChangeLog 7878
 MD5 dbaa6f09202bfea8c248e1f7c222d40f metadata.xml 488
 MD5 0fd51a0eb686552fb6ec45a0bc151d75 files/digest-skype-1.1.0.3 209
 MD5 5105ec59acb037592219bdc10c0f09b7 files/skype.debus.config 436
 MD5 3ebd302142d17df643fa2055d99d0fc7 files/sDaemonWrapper 1740
 MD5 0fd51a0eb686552fb6ec45a0bc151d75 files/digest-skype-1.1.0.3-r1 209
+MD5 775f4eceb67dc9859f7d9a671f3b7216 files/sDaemonWrapper-r1 1984
+MD5 25e2e1abc5814695e1a6d9691fe61b5d files/digest-skype-1.1.0.20-r1 211
 MD5 38aacc11c3b797c1f3b6008b73fcc881 files/digest-skype-1.1.0.13 211
 MD5 25e2e1abc5814695e1a6d9691fe61b5d files/digest-skype-1.1.0.20 211
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzV2j8zY1VwezZiERAkQaAJ96g2W5bYbBXci+egokiU5E/cNs2ACgks4v
-xiqjYTBEzU8Xc7zl4JNS9Jc=
-=7Se/
------END PGP SIGNATURE-----
diff --git a/net-im/skype/files/digest-skype-1.1.0.20-r1 b/net-im/skype/files/digest-skype-1.1.0.20-r1
new file mode 100644
index 000000000000..8639dc73861c
--- /dev/null
+++ b/net-im/skype/files/digest-skype-1.1.0.20-r1
@@ -0,0 +1,3 @@
+MD5 5b3195993d01ed0d439a28b505665382 skype-avatars-1.0.tgz 377763
+MD5 3dda77f8f4d12157f91c2cc18da4fb1c skype-1.1.0.20.tar.bz2 6426139
+MD5 f100bd33f6cc31c7c7ebfd5010255c6c skype_staticQT-1.1.0.20.tar.bz2 9180204
diff --git a/net-im/skype/files/sDaemonWrapper-r1 b/net-im/skype/files/sDaemonWrapper-r1
new file mode 100644
index 000000000000..5f221d2e028c
--- /dev/null
+++ b/net-im/skype/files/sDaemonWrapper-r1
@@ -0,0 +1,59 @@
+#!/bin/bash
+#
+# Wrapper script to run Skype with sound wrapper when possible
+logfile="${HOME}/.Skype/skype.log"
+progname="skype"
+progpath="/opt/${progname}/"
+progopts="--resources-path ${progpath}"
+shellcheck1=` which artsshell 2> /dev/null `
+shellcheck2=` which esd 2> /dev/null `
+artsdcheck=` ps x | grep artsd | grep -v grep `
+## We use ps ax for esd as esd can be used globaly for all users.
+esdcheck=` ps ax | grep "esd ." | grep -v grep `
+skypecmd="${progpath}${progname}.bin"
+wrapsound="yes"
+
+[ "$1" == "oss" ] && wrapsound="no"
+
+[ -d "$(dirname "${logfile}")" ] || mkdir "$(dirname "${logfile}")"
+
+echo "===== " `date` " =====" > ${logfile}
+if [[ -z ${shellcheck1} && -z ${shellcheck2} ]]
+then
+	echo "No installed artsshell or esd found"
+	echo "Assuming you're running no sound daemon"
+	echo "Starting ${progname} without a sound wrapper" | tee --append "${logfile}"
+else
+	if [[ ${wrapsound} == "yes" && ${shellcheck1} == $(artsc-config --arts-prefix)/bin/artsshell && -n ${artsdcheck} ]]
+	then
+		echo "Running artsd found"
+		echo "Starting artsd wrapped ${progname}" | tee --append "${logfile}"
+		skypecmd="MALLOC_CHECK_=0 artsdsp -m ${skypecmd}"
+	elif [[ ${wrapsound} == "yes" && ${shellcheck2} == /usr/bin/esd && -n ${esdcheck} ]]
+	then
+		echo "Running esd found"
+		echo "Starting esd wrapped ${progname}" | tee --append "${logfile}"
+		skypecmd="esddsp ${skypecmd}"
+	else
+		if [ ${wrapsound} == "yes" ]
+		then
+			echo "No running artsd or esd found"
+		else
+			echo "Use of sound-daemon disabled"
+		fi
+		echo "Starting ${progname} without sound daemon" | tee --append "${logfile}"
+	fi
+fi
+
+echo "${skypecmd} ${progopts}" >> ${logfile}
+echo "=========================================="
+${skypecmd} ${progopts} >> ${logfile} 2>> ${logfile}
+
+if [[ $? -ne 0 ]] ; then
+	echo "Running wrapped Skype failed, trying not-wrapped mode..."
+	echo "=========================================="
+	skypecmd="${progpath}${progname}.bin"
+	${skypecmd} ${progopts} >> ${logfile} 2>&1
+fi
+
+exit $?
diff --git a/net-im/skype/skype-1.1.0.20-r1.ebuild b/net-im/skype/skype-1.1.0.20-r1.ebuild
new file mode 100644
index 000000000000..49d2b2b68972
--- /dev/null
+++ b/net-im/skype/skype-1.1.0.20-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.1.0.20-r1.ebuild,v 1.1 2005/07/10 14:04:18 humpback Exp $
+
+inherit eutils
+
+
+#If you want to know when this package will be marked stable please see the Changelog
+RESTRICT="nomirror"
+AVATARV="1.0"
+DESCRIPTION="${PN} is a P2P-VoiceIP client."
+HOMEPAGE="http://www.${PN}.com/"
+SRC_URI="http://dev.gentoo.org/~humpback/skype-avatars-${AVATARV}.tgz
+		!static? ( http://download.skype.com/linux/${P}.tar.bz2 )
+		static? ( http://download.skype.com/linux/${PN}_staticQT-${PV}.tar.bz2 )"
+LICENSE="skype-eula"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="static arts esd"
+DEPEND="
+	amd64? ( app-emulation/emul-linux-x86-glibc
+		>=app-emulation/emul-linux-x86-xlibs-1.2
+		>=app-emulation/emul-linux-x86-baselibs-2.1.1
+		!static? ( >=app-emulation/emul-linux-x86-qtlibs-1.1 ) )
+	x86? ( !static? ( >=x11-libs/qt-3.2 )
+		>=sys-libs/glibc-2.3.2 )"
+RDEPEND="${DEPEND}
+	>=sys-apps/dbus-0.23.4"
+
+src_unpack() {
+	if use static;
+		then
+		unpack ${PN}_staticQT-${PV}.tar.bz2
+		mv ${PN}_staticQT-${PV} ${S}
+	else
+		unpack ${P}.tar.bz2
+	fi
+	cd ${P}
+	unpack skype-avatars-${AVATARV}.tgz
+}
+
+src_install() {
+	## Install the wrapper script
+	mv skype skype.bin
+	cp ${FILESDIR}/sDaemonWrapper-r1 skype
+
+	dodir /opt/${PN}
+	exeopts -m0755
+	exeinto /opt/${PN}
+	doexe skype
+	doexe skype.bin
+	doexe skype-callto-handler
+	insinto /opt/${PN}/sound
+	doins sound/*.wav
+
+	insinto /opt/${PN}/lang
+	doins lang/*.qm
+	#Skype still shows ALL languagues no matter what were installed
+	#for i in ${LINGUAS}; do
+	#	if [ -f lang/${PN}_${i}.qm ]; then
+	#		doins lang/${PN}_${i}.qm
+	#	fi;
+	#done;
+	insinto /etc/dbus-1/system.d
+	doins skype.conf
+
+	insinto /opt/${PN}/avatars
+	doins avatars/*.jpg
+
+	insinto /opt/${PN}
+	make_desktop_entry skype "Skype VoIP" skype
+	for SIZE in 16 32 48
+	do
+		insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
+		newins ${S}/icons/${PN}_${SIZE}_32.png ${PN}.png
+	done
+	fowners root:audio /opt/skype/skype.bin
+	fowners root:audio /opt/skype/skype
+	fowners root:audio /opt/skype/skype-callto-handler
+	dodir /usr/bin/
+	dosym /opt/skype/skype /usr/bin/skype
+	# Install the Documentation
+	dodoc README LICENSE
+
+	# TODO: Optional configuration of callto:// in KDE, Mozilla and friends
+}
+
+pkg_postinst() {
+	einfo "Have a look at ${PORTDIR}/licenses/${LICENSE} before running this software"
+	einfo "If you have sound problems please visit: "
+	einfo "http://forum.skype.com/bb/viewtopic.php?t=4489"
+	if ( use arts );
+	then
+		ewarn "Dont forget to configure your arts to work in Full-Duplex mode"
+		ewarn "Open controlcenter, go to \"Sound & Multimedia\"->\"Sound System\""
+		ewarn "On the \"Hardware\" tab, check the box next to \"Full duplex\"."
+	fi
+	##I do not know if this is true for this version. But will leave the note here
+	ewarn "If you are upgrading and skype does not autologin do a manual login"
+	ewarn "you will not lose your contacts."
+}