diff options
| -rw-r--r-- | net-im/skype/ChangeLog | 10 | ||||
| -rw-r--r-- | net-im/skype/Manifest | 10 | ||||
| -rw-r--r-- | net-im/skype/files/digest-skype-0.93.0.3 | 2 | ||||
| -rw-r--r-- | net-im/skype/files/digest-skype-0.93.0.3-r2 (renamed from net-im/skype/files/digest-skype-0.93.0.3-r1) | 0 | ||||
| -rw-r--r-- | net-im/skype/files/sDaemonWrapper | 28 | ||||
| -rw-r--r-- | net-im/skype/skype-0.93.0.3-r2.ebuild (renamed from net-im/skype/skype-0.93.0.3-r1.ebuild) | 6 | ||||
| -rw-r--r-- | net-im/skype/skype-0.93.0.3.ebuild | 97 |
7 files changed, 36 insertions, 117 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index 5f6ba735dd9c..718560771faa 100644 --- a/net-im/skype/ChangeLog +++ b/net-im/skype/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-im/skype # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.21 2004/12/28 13:35:56 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.22 2004/12/30 11:33:31 humpback Exp $ + +*skype-0.93.0.3-r2 (30 Dec 2004) + + 30 Dec 2004; Gustavo Felisberto <humpback@gentoo.org>; files/sDaemonWrapper, + -skype-0.93.0.3-r1.ebuild, +skype-0.93.0.3-r2.ebuild, + -skype-0.93.0.3.ebuild: + Fixing problem with wrapper script and instalation of avatars. Credits go to + Bruno in bug #75237 28 Dec 2004; Gustavo Felisberto <humpback@gentoo.org>; : New version that installs the avatars. More work still to do. See bug #75237. diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest index c2460c30d786..d323dc72ceba 100644 --- a/net-im/skype/Manifest +++ b/net-im/skype/Manifest @@ -1,7 +1,5 @@ -MD5 75132cd407c651ab8e8ec47e234cc865 ChangeLog 4034 +MD5 68a9e157268f7f248c88d29d6b769e4c ChangeLog 4331 MD5 dbaa6f09202bfea8c248e1f7c222d40f metadata.xml 488 -MD5 cb1b687263323e29fdc853c69eb820db skype-0.93.0.3-r1.ebuild 3079 -MD5 c42eee082c8b4c25c69dd7ff45b7f66d skype-0.93.0.3.ebuild 3000 -MD5 03415ef1d1487c86e7ef4ac28dc4dc80 files/digest-skype-0.93.0.3 145 -MD5 1d81e190261e1a101fff0ecacaaa833d files/digest-skype-0.93.0.3-r1 211 -MD5 e194f7f5ac6776962adedca393f8c3e8 files/sDaemonWrapper 1629 +MD5 410af8237887aac7569ff2db303f22e0 skype-0.93.0.3-r2.ebuild 3174 +MD5 1d81e190261e1a101fff0ecacaaa833d files/digest-skype-0.93.0.3-r2 211 +MD5 b59b4eab9520b2fcb36b5b036a39c4ec files/sDaemonWrapper 1718 diff --git a/net-im/skype/files/digest-skype-0.93.0.3 b/net-im/skype/files/digest-skype-0.93.0.3 deleted file mode 100644 index a2dd4f0118f9..000000000000 --- a/net-im/skype/files/digest-skype-0.93.0.3 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 aba3ab2908c5abe6f7e90918db03b1dd skype-0.93.0.3.tar.bz2 4293627 -MD5 82448f56fd7f8fb59b00869660ca0a4f skype_staticQT-0.93.0.3.tar.bz2 6709041 diff --git a/net-im/skype/files/digest-skype-0.93.0.3-r1 b/net-im/skype/files/digest-skype-0.93.0.3-r2 index 6a5545021b2e..6a5545021b2e 100644 --- a/net-im/skype/files/digest-skype-0.93.0.3-r1 +++ b/net-im/skype/files/digest-skype-0.93.0.3-r2 diff --git a/net-im/skype/files/sDaemonWrapper b/net-im/skype/files/sDaemonWrapper index e9c8d54d1578..89d349468923 100644 --- a/net-im/skype/files/sDaemonWrapper +++ b/net-im/skype/files/sDaemonWrapper @@ -1,12 +1,15 @@ #!/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}" +progopts="--resources-path ${progpath}" 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 ` +skypecmd="${progpath}/${progname}.bin" wrapsound="yes" [ "$1" == "oss" ] && wrapsound="no" @@ -18,28 +21,33 @@ then echo "Assuming you're running no sound daemon" echo "Starting ${progname} without a sound wrapper" echo "Starting ${progname} without a sound wrapper" >> ${logfile} - ${progpath}/${progname}.bin ${progopts} >> ${logfile} 2>> ${logfile} - else if [[ ${wrapsound} == "yes" && ${shellcheck1} == ${KDEDIR}/bin/artsshell && -n ${artsdcheck} ]] then echo "Running artsd found" echo "Starting artsd wrapped ${progname}" echo "Starting artsd wrapped ${progname}" >> ${logfile} - artsdsp -m ${progpath}/${progname}.bin ${progopts} >> ${logfile} 2>> ${logfile} - + skypecmd="artsdsp -m ${skypecmd}" elif [[ ${wrapsound} == "yes" && ${shellcheck2} == /usr/bin/esd && -n ${esdcheck} ]] then echo "Running esd found" - echo "Starting esd wrapped ${progname}" + echo "Starting esd wrapped ${progname}" echo "Starting esd wrapped ${progname}" >> ${logfile} - esddsp ${progpath}/${progname}.bin ${progopts} >> ${logfile} 2>> ${logfile} + skypecmd="esddsp ${skypecmd}" else - echo "No running artsd or esd found" + 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" echo "Starting ${progname} without sound daemon" >> ${logfile} - ${progpath}/${progname}.bin ${progopts} >> ${logfile} 2>> ${logfile} fi - fi + +echo "${skypecmd} ${progopts}" >> ${logfile} +echo "==========================================" +${skypecmd} ${progopts} >> ${logfile} 2>> ${logfile} + exit 0 diff --git a/net-im/skype/skype-0.93.0.3-r1.ebuild b/net-im/skype/skype-0.93.0.3-r2.ebuild index dfb94391da69..965e7307e0a9 100644 --- a/net-im/skype/skype-0.93.0.3-r1.ebuild +++ b/net-im/skype/skype-0.93.0.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-0.93.0.3-r1.ebuild,v 1.1 2004/12/28 13:35:56 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-0.93.0.3-r2.ebuild,v 1.1 2004/12/30 11:33:31 humpback Exp $ inherit eutils @@ -35,6 +35,8 @@ src_unpack() { else unpack ${P}.tar.bz2 fi + cd ${P} + unpack skype-avatars-${AVATARV}.tgz } src_install() { @@ -62,6 +64,8 @@ src_install() { # fi; #done; + insinto /opt/skype/avatars + doins avatars/*.jpg insinto /opt/skype make_desktop_entry skype "Skype VoIP" ../icons/hicolor/48x48/apps/skype.png diff --git a/net-im/skype/skype-0.93.0.3.ebuild b/net-im/skype/skype-0.93.0.3.ebuild deleted file mode 100644 index 2e8917ca9dac..000000000000 --- a/net-im/skype/skype-0.93.0.3.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-0.93.0.3.ebuild,v 1.1 2004/12/26 21:06:17 humpback Exp $ - -inherit eutils - - -#If you want to know when this package will be marked stable please see the Changelog -RESTRICT="nomirror" -DESCRIPTION="${PN} is a P2P-VoiceIP client." -HOMEPAGE="http://www.${PN}.com/" -SRC_URI=" - !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 - app-emulation/emul-linux-x86-compat - app-emulation/emul-linux-x86-baselibs - !static? ( app-emulation/emul-linux-x86-qtlibs ) - ) - x86? ( !static? ( >=x11-libs/qt-3.2 ) - >=sys-libs/glibc-2.2.5 - )" - -src_unpack() { - if use static; - then - unpack ${PN}_staticQT-${PV}.tar.bz2 - mv ${PN}_staticQT-${PV} ${S} - else - unpack ${P}.tar.bz2 - fi -} - -src_install() { - ## Install the wrapper script - mv skype skype.bin - cp ${FILESDIR}/sDaemonWrapper skype - - dodir /opt/skype - exeopts -m0755 - exeinto /opt/skype - doexe skype - doexe skype.bin - #This version nolonger has the need for resources hardcoded it can use - #./skype --resources-path /some/directory/with/resources but our script - #must be changed and the older ebuilds removed first - insinto /opt/skype/sound - doins sound/*.wav - insinto /usr/share/skype/lang - doins lang/*.qm - # install only en and LINGUAS langpacks - insinto /opt/skype/lang - for i in ${LINGUAS}; do - if [ -f lang/${PN}_${i}.qm ]; then - doins lang/${PN}_${i}.qm - fi; - done; - - - insinto /opt/skype - make_desktop_entry skype "Skype VoIP" ../icons/hicolor/48x48/apps/skype.png - for SIZE in 16 32 48 - do - mkdir ${S}/icons/${SIZE} - cp ${S}/icons/${PN}_${SIZE}_32.png ${S}/icons/${SIZE}/${PN}.png - dodir /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps - insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps - doins ${S}/icons/${SIZE}/${PN}.png - done - fowners root:audio /opt/skype/skype.bin - fowners root:audio /opt/skype/skype - dodir /usr/bin/ - dosym /opt/skype/skype /usr/bin/skype - # Install the Documentation - dodoc README LICENSE -} - -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 "There are some problems with this version of skype when upgrading" - ewarn "If you have problems please go to:" - ewarn "http://forum.skype.com/bb/viewtopic.php?t=7187" -} |