diff options
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/skype/ChangeLog | 9 | ||||
| -rw-r--r-- | net-im/skype/Manifest | 33 | ||||
| -rw-r--r-- | net-im/skype/files/digest-skype-1.2.0.21-r1 | 6 | ||||
| -rw-r--r-- | net-im/skype/files/sDaemonWrapper-r1 | 10 | ||||
| -rwxr-xr-x | net-im/skype/files/skype-callto-handler | 83 | ||||
| -rw-r--r-- | net-im/skype/skype-1.2.0.21-r1.ebuild | 112 |
6 files changed, 244 insertions, 9 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index 62e0de1b0ca9..736483a12151 100644 --- a/net-im/skype/ChangeLog +++ b/net-im/skype/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-im/skype # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.50 2006/01/19 20:10:08 sekretarz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.51 2006/01/30 17:53:19 humpback Exp $ + +*skype-1.2.0.21-r1 (30 Jan 2006) + + 30 Jan 2006; Gustavo Felisberto <humpback@gentoo.org>; + files/sDaemonWrapper-r1, +files/skype-callto-handler, + +skype-1.2.0.21-r1.ebuild: + Revision bump for the fix to amd64 32bits wrapper. 19 Jan 2006; Karol Wojtaszek <sekretarz@gentoo.org> skype-1.2.0.18.ebuild: Stable on amd64, bug #116812 diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest index 966b63de2174..64b542ca6ec0 100644 --- a/net-im/skype/Manifest +++ b/net-im/skype/Manifest @@ -1,16 +1,37 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 5556d5473bcd80e6144ef1e2fb88d6db ChangeLog 9399 +MD5 0c89281431db3f7d0c13a87f79bf6c3f ChangeLog 9628 +RMD160 b7ec1c03bb53014b20863bc6ecf6ec209307048e ChangeLog 9628 +SHA256 e963fb48f7eb8233eff3323ca4139358c2299e0b2054cb4632f0898f7438de4b ChangeLog 9628 MD5 efa11b9d952f6902453fe3e143e6b660 files/digest-skype-1.2.0.18 212 -MD5 88c4b3d7e9d748c978aaa9e3ead55e71 files/sDaemonWrapper-r1 2023 +RMD160 f236ab75f88ee06903158e74aac692f7704521a9 files/digest-skype-1.2.0.18 212 +SHA256 8f3700d09375adea1afd78755a49075e8cd9039bc2f6c187bb245a1137ec08b0 files/digest-skype-1.2.0.18 212 +MD5 5bedbe8b67e3aef36103d941e4cd7da4 files/digest-skype-1.2.0.21-r1 512 +RMD160 47e3d3a52fc9fd4df7d213687a13433e1c6ba1ab files/digest-skype-1.2.0.21-r1 512 +SHA256 4b42f1a7bddcb3e6e5983b00f4586a56e33980ae9ccd64d9f1f2970ba21aad2e files/digest-skype-1.2.0.21-r1 512 +MD5 d935b48b3432eece5fd029cdc6158669 files/sDaemonWrapper-r1 2156 +RMD160 29aa71c39c0e6049d9073f1a37b4548d76195248 files/sDaemonWrapper-r1 2156 +SHA256 997724ef746507af4f2255ee33d93316101dd072388807103cab98172282a4a8 files/sDaemonWrapper-r1 2156 +MD5 4933bb1536a4a1ffed907d600ab8a927 files/skype-callto-handler 1813 +RMD160 c9d6ebefac813587b294c561808729ab15aafe70 files/skype-callto-handler 1813 +SHA256 dc004f93e107622910980acf6d132ee603e12e294ca35870e3a04184db64ae3c files/skype-callto-handler 1813 MD5 5105ec59acb037592219bdc10c0f09b7 files/skype.debus.config 436 +RMD160 ec47725458e05cca8e37316989f473963b5b654d files/skype.debus.config 436 +SHA256 6de68b9e62afd284f1d7d5899fc5747de2be2c18a96022130826917625941ea2 files/skype.debus.config 436 MD5 dbaa6f09202bfea8c248e1f7c222d40f metadata.xml 488 +RMD160 0dc53516bb6b9f04aad7625aaf8e81f94f288117 metadata.xml 488 +SHA256 964cb103f057a79a194dea8ef8cd183400daa2d8f7041a57f95f3544b0b0a7a9 metadata.xml 488 MD5 24fc208e0d27d01995cbc0d3fe82e0ef skype-1.2.0.18.ebuild 2986 +RMD160 8eb183eb0badf7dcb2fc00ecd8d2b382445f35e4 skype-1.2.0.18.ebuild 2986 +SHA256 c7489559954dd22c2200454995c943c410b79be0d8093e270f8acd52af2492cc skype-1.2.0.18.ebuild 2986 +MD5 7ba24517082125edf920d1e6fc699913 skype-1.2.0.21-r1.ebuild 3417 +RMD160 d90e9c3a14944d496efb4671343dbd73634c43c5 skype-1.2.0.21-r1.ebuild 3417 +SHA256 29a75c351abb3e8c2bb26b8d76c0f4739f47be04cb23f219746c0dbe50e6cd43 skype-1.2.0.21-r1.ebuild 3417 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) +Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFD0ACJub4+zaPCR/oRAisQAKCEUQ1JLqTdo5sUkfM0pNvTcPmYDwCeJOUj -hP1efvR1bNntGrNC9THSPNo= -=eYEz +iD8DBQFD3lKn8zY1VwezZiERApoPAJ9CM5sDtPjSh+2nJvPD7jPWJDfX2QCfWSlO +/eJ3hWaf0ZTAPXFyqXnOAqM= +=c3GZ -----END PGP SIGNATURE----- diff --git a/net-im/skype/files/digest-skype-1.2.0.21-r1 b/net-im/skype/files/digest-skype-1.2.0.21-r1 new file mode 100644 index 000000000000..77caa46f1076 --- /dev/null +++ b/net-im/skype/files/digest-skype-1.2.0.21-r1 @@ -0,0 +1,6 @@ +MD5 b73a2d828f262a45506d2b95a005a605 skype-1.2.0.21-1mdk.i586.rpm 7802660 +RMD160 0f76ee645d1e90d52a4478a4397e90c6473f86b0 skype-1.2.0.21-1mdk.i586.rpm 7802660 +SHA256 c70e7ff0add74ceb1b833398eaa07c5699207845f70ebc0a35414af8ff473b12 skype-1.2.0.21-1mdk.i586.rpm 7802660 +MD5 5b3195993d01ed0d439a28b505665382 skype-avatars-1.0.tgz 377763 +RMD160 54f6faeebc6509ebec8418fc27d0b2fbdc383bcf skype-avatars-1.0.tgz 377763 +SHA256 de7a9187a99ef7a13bba99c4ad61f6809bbd1e129f6456267b416090e57d71d6 skype-avatars-1.0.tgz 377763 diff --git a/net-im/skype/files/sDaemonWrapper-r1 b/net-im/skype/files/sDaemonWrapper-r1 index ab9c935289f5..900296188b5f 100644 --- a/net-im/skype/files/sDaemonWrapper-r1 +++ b/net-im/skype/files/sDaemonWrapper-r1 @@ -13,6 +13,12 @@ esdcheck=` ps ax | grep "esd ." | grep -v grep ` skypecmd="${progpath}${progname}.bin" wrapsound="yes" +#Use 32bits wrapper in 64 bits system +xdspsuffix="" +if [ `uname -m` == "x86_64" ]; then + xdspsuffix=32 +fi + [ "$1" == "oss" ] && wrapsound="no" [ -d "$(dirname "${logfile}")" ] || mkdir "$(dirname "${logfile}")" @@ -28,12 +34,12 @@ else then echo "Running artsd found" echo "Starting artsd wrapped ${progname}" | tee --append "${logfile}" - skypecmd="env MALLOC_CHECK_=0 artsdsp -m ${skypecmd}" + skypecmd="env MALLOC_CHECK_=0 artsdsp${xdspsuffix} -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}" + skypecmd="esddsp${xdspsuffix} ${skypecmd}" else if [ ${wrapsound} == "yes" ] then diff --git a/net-im/skype/files/skype-callto-handler b/net-im/skype/files/skype-callto-handler new file mode 100755 index 000000000000..e4614d754e0c --- /dev/null +++ b/net-im/skype/files/skype-callto-handler @@ -0,0 +1,83 @@ +#!/bin/sh + +SKYPE="skype" +DBUS_SEND="dbus-send" +BUS="--system" +SKYPE_BUS="" +ID=`id -u` + +print_help() +{ + cat << EOF +Skype "callto://" handler + Usage: skype-callto-handler [BUS] callto://user + Where BUS can be either "--system" (default) or "--session" +EOF +} + +if [ -z "$1" -o "$1" = "--help" ]; then + print_help + exit 1 +fi + +if [ "--system" = "$1" -o "--session" = "$1" ];then + BUS="$1" + shift 1 +fi + +if [ "--session" = "$BUS" ]; then + SKYPE_BUS="--use-session-dbus" +fi + +if [ -z "$1" ];then + print_help + exit 1 +fi + +CALLTO=`echo $1 | sed 's/callto:\/\///'` + +PING=`$DBUS_SEND $BUS --type=method_call --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.ServiceExists string:com.Skype.API 2> /dev/null`; RESULT=$? + +if [ $RESULT -ne 0 ]; then + echo "ERROR: Failed to connect to DBUS daemon!" + exit 1 +fi + +echo "$PING" | grep -q "boolean:true"; RESULT=$? + +if [ $RESULT -ne 0 ]; then + echo "Running Skype instance not found, launching" + $SKYPE $SKYPE_BUS --callto "$CALLTO" & + exit 0 +fi + +SKYPE_ID=`$DBUS_SEND $BUS --type=method_call --print-reply --dest=com.Skype.API /com/Skype com.Skype.API.Ping 2> /dev/null`;RESULT=$? + +if [ $RESULT -ne 0 ]; then + echo "ERROR: Skype is running on specified bus, but is misbehaving!" + exit 1 +fi + +TEMP=`echo "$SKYPE_ID" | grep -o "int32:[0-9]*"` + +SKYPE_ID=`echo "$TEMP" | cut -f2 -d':'` + +if [ $ID -ne $SKYPE_ID ]; then + echo "ERROR: Skype is running on specified bus, but for different UNIX user!" + exit 1 +fi + +REPLY=`$DBUS_SEND $BUS --type=method_call --print-reply --dest=com.Skype.API /com/Skype com.Skype.API.Invoke string:CALL\ $CALLTO 2> /dev/null`;RESULT=$? + +if [ $RESULT -ne 0 ]; then + echo "ERROR: Error when communicating with Skype!" + exit 1 +fi + +TEMP=`echo "$REPLY" | grep -o "string:.*"` + +REPLY=`echo "$TEMP" | cut -f2 -d':'` + +echo $REPLY + +exit 0 diff --git a/net-im/skype/skype-1.2.0.21-r1.ebuild b/net-im/skype/skype-1.2.0.21-r1.ebuild new file mode 100644 index 000000000000..8a485e553344 --- /dev/null +++ b/net-im/skype/skype-1.2.0.21-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.2.0.21-r1.ebuild,v 1.1 2006/01/30 17:53:19 humpback Exp $ + +inherit eutils qt3 rpm + + +#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 + http://download.skype.com/linux/${P}-1mdk.i586.rpm" +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? ( >=sys-libs/glibc-2.3.2 )" +RDEPEND="${DEPEND} + >=sys-apps/dbus-0.23.4" + +src_unpack() { + rpm_unpack ${DISTDIR}/${P}-1mdk.i586.rpm + cd ${WORKDIR}/usr/share + unpack skype-avatars-${AVATARV}.tgz +} + +src_install() { + ## Install the wrapper script + cd ${WORKDIR}/usr/share + mv ${WORKDIR}/usr/bin/skype skype.bin + mv ${WORKDIR}/etc/dbus-1/system.d/skype.conf skype.conf + mv applications/skype.desktop skype.desktop + mv skype/* . + mv doc/${P}/LICENSE LICENSE + mv doc/${P}/README README + mkdir ${WORKDIR}/temp + cp pixmaps/skype.png ${WORKDIR}/temp/skype.png + rm -rf skype + cp ${FILESDIR}/sDaemonWrapper-r1 skype + cp ${FILESDIR}/skype-callto-handler skype-callto-handler + + dodir /opt/${PN} + exeopts -m0755 + exeinto /opt/${PN} + doexe skype + doexe skype.bin + doexe skype-callto-handler + insinto /opt/${PN}/sound + doins sound/*.wav + cd ${WORKDIR}/usr/share + insinto /opt/${PN}/lang + doins lang/*.qm + cd ${WORKDIR}/usr/share + #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 + cd ${WORKDIR}/usr/share + doins skype.conf + + insinto /opt/${PN}/avatars + cd ${WORKDIR}/usr/share + doins avatars/*.jpg + + insinto /opt/${PN} + cd ${WORKDIR}/usr/share + make_desktop_entry skype "Skype VoIP" skype + insinto /usr/share/pixmaps + doins pixmaps/skype.png + + cd ${WORKDIR}/usr/share +# for SIZE in 16 32 48 +# do +# insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps +# newins ${WORKDIR}/usr/share/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 + cd ${WORKDIR}/usr/share + 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." +} |