Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net-im/skype/ChangeLog9
-rw-r--r--net-im/skype/Manifest14
-rw-r--r--net-im/skype/files/digest-skype-0.90.0.142
-rw-r--r--net-im/skype/files/digest-skype-0.93.0.32
-rw-r--r--net-im/skype/files/sDaemonWrapper22
-rw-r--r--net-im/skype/skype-0.90.0.14.ebuild78
-rw-r--r--net-im/skype/skype-0.93.0.3.ebuild97
7 files changed, 126 insertions, 98 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index 9e20bf8a8197..661200a64c68 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,13 @@
# 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.19 2004/11/19 17:02:45 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.20 2004/12/26 21:06:17 humpback Exp $
+
+*skype-0.93.0.3 (26 Dec 2004)
+
+ 26 Dec 2004; Gustavo Felisberto <humpback@gentoo.org>; files/sDaemonWrapper,
+ -skype-0.90.0.14.ebuild, +skype-0.93.0.3.ebuild:
+ Removed older versions and added 0.93.0.3 with new wrapper script. Also adding
+ back to package.mask due to problems with gcc 3.4.*
*skype-0.92.0.12 (19 Nov 2004)
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index 55c29c402a1e..aad7a83f280c 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -1,13 +1,5 @@
MD5 8d0f7b6da58de22a3a2de2cb9e81c1dd ChangeLog 3597
MD5 dbaa6f09202bfea8c248e1f7c222d40f metadata.xml 488
-MD5 96cb527302f0fb792b50d17688f3e960 skype-0.90.0.14.ebuild 2282
-MD5 fa41fd6e4a9ac8ea7268fc792476aec5 skype-0.91.0.12.ebuild 2788
-MD5 6748b98bcab6c40165382d5251da793a skype-0.91.0.3.ebuild 2552
-MD5 4fdca39ab4342dd4bfa279c41a35396b skype-0.92.0.12.ebuild 2748
-MD5 84b4a29f63c5d39ae55d8230a658a454 skype-0.92.0.2.ebuild 2864
-MD5 cf72a8c947b8c08cff6c62238f969ac7 files/digest-skype-0.90.0.14 155
-MD5 28cf52b725b1cefac1d203076490e27b files/digest-skype-0.91.0.12 155
-MD5 de387eb2fc522530e0f02e91b2410a5f files/digest-skype-0.91.0.3 153
-MD5 77eca151b9b0f27f5df7ee3407443729 files/digest-skype-0.92.0.12 147
-MD5 960c5b12d345523a4d5e8e4308dea9a1 files/digest-skype-0.92.0.2 153
-MD5 eaca94e60b2e92261e007dd3630436ab files/sDaemonWrapper 998
+MD5 80bf00854ff1ccc8e6fb62de5d46103e skype-0.93.0.3.ebuild 2994
+MD5 03415ef1d1487c86e7ef4ac28dc4dc80 files/digest-skype-0.93.0.3 145
+MD5 002b63f29d3c1b699ed0cb0ef61036db files/sDaemonWrapper 1541
diff --git a/net-im/skype/files/digest-skype-0.90.0.14 b/net-im/skype/files/digest-skype-0.90.0.14
deleted file mode 100644
index 479d0eec53f2..000000000000
--- a/net-im/skype/files/digest-skype-0.90.0.14
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a68f4c631481e9a491ee1bc9daf11ac6 skype_ver-0_90_0_14.tar.bz2 3395872
-MD5 a0e297fa503d57ef6117768101d2ccb6 skype_ver-0_90_0_14-staticQT.tar.bz2 5768600
diff --git a/net-im/skype/files/digest-skype-0.93.0.3 b/net-im/skype/files/digest-skype-0.93.0.3
new file mode 100644
index 000000000000..a2dd4f0118f9
--- /dev/null
+++ b/net-im/skype/files/digest-skype-0.93.0.3
@@ -0,0 +1,2 @@
+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/sDaemonWrapper b/net-im/skype/files/sDaemonWrapper
index d092696f7cc0..e9c8d54d1578 100644
--- a/net-im/skype/files/sDaemonWrapper
+++ b/net-im/skype/files/sDaemonWrapper
@@ -1,34 +1,44 @@
#!/bin/bash
+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 `
esdcheck=` ps x | grep "esd ." | grep -v grep `
+wrapsound="yes"
+[ "$1" == "oss" ] && wrapsound="no"
+
+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"
- ${progpath}/${progname}.bin
+ echo "Starting ${progname} without a sound wrapper" >> ${logfile}
+ ${progpath}/${progname}.bin ${progopts} >> ${logfile} 2>> ${logfile}
else
- if [[ ${shellcheck1} == ${KDEDIR}/bin/artsshell && -n ${artsdcheck} ]]
+ if [[ ${wrapsound} == "yes" && ${shellcheck1} == ${KDEDIR}/bin/artsshell && -n ${artsdcheck} ]]
then
echo "Running artsd found"
echo "Starting artsd wrapped ${progname}"
- artsdsp -m ${progpath}/${progname}.bin
+ echo "Starting artsd wrapped ${progname}" >> ${logfile}
+ artsdsp -m ${progpath}/${progname}.bin ${progopts} >> ${logfile} 2>> ${logfile}
- elif [[ ${shellcheck2} == /usr/bin/esd && -n ${esdcheck} ]]
+ elif [[ ${wrapsound} == "yes" && ${shellcheck2} == /usr/bin/esd && -n ${esdcheck} ]]
then
echo "Running esd found"
echo "Starting esd wrapped ${progname}"
- esddsp ${progpath}/${progname}.bin
+ echo "Starting esd wrapped ${progname}" >> ${logfile}
+ esddsp ${progpath}/${progname}.bin ${progopts} >> ${logfile} 2>> ${logfile}
else
echo "No running artsd or esd found"
echo "Starting ${progname} without sound daemon"
- ${progpath}/${progname}.bin
+ echo "Starting ${progname} without sound daemon" >> ${logfile}
+ ${progpath}/${progname}.bin ${progopts} >> ${logfile} 2>> ${logfile}
fi
fi
diff --git a/net-im/skype/skype-0.90.0.14.ebuild b/net-im/skype/skype-0.90.0.14.ebuild
deleted file mode 100644
index ea4a279a5474..000000000000
--- a/net-im/skype/skype-0.90.0.14.ebuild
+++ /dev/null
@@ -1,78 +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.90.0.14.ebuild,v 1.2 2004/07/25 13:53:05 humpback Exp $
-
-inherit eutils
-
-SVER=${PV//./_}
-RESTRICT="nomirror"
-DESCRIPTION="${PN} is a P2P-VoiceIP client."
-HOMEPAGE="http://www.${PN}.com/"
-SRC_URI="
- qt? ( http://download.skype.com/linux/${PN}_ver-${SVER}.tar.bz2 )
- !qt? ( http://download.skype.com/linux/${PN}_ver-${SVER}-staticQT.tar.bz2 )"
-LICENSE="skype-eula"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="qt arts esd"
-DEPEND="qt? ( >=x11-libs/qt-3.2 )
- >=sys-libs/glibc-2.2.5"
-S="${WORKDIR}/${PN}_ver-${SVER}"
-
-src_unpack() {
- if use !qt;
- then
- unpack ${PN}_ver-${SVER}-staticQT.tar.bz2
- cd ${WORKDIR}
- mv ${PN}_ver-${SVER}-staticQT ${PN}_ver-${SVER}
- cd ${S}
- else
- unpack ${PN}_ver-${SVER}.tar.bz2
- cd ${S}
- fi
-}
-
-src_install() {
- ## Install the wrapper script
- if ( use arts || use esd );
- then
- mv skype skype.bin
- cp ${FILESDIR}/sDaemonWrapper skype
- fi
-
- dodir /opt/skype
- exeopts -m0755
- exeinto /opt/skype
- doexe skype
- ( use arts || use esd ) && doexe skype.bin
- #It seems skype wants the wave in /usr/share/skype
- #http://forum.skype.com/bb/viewtopic.php?t=4145
- insinto /usr/share/skype
- doins call_in.wav
- insinto /opt/skype
- make_desktop_entry skype "Skype VoIP" ../icons/hicolor/48x48/apps/skype.png
- for SIZE in 16 24 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
- ( 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
-}
-
-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
-}
diff --git a/net-im/skype/skype-0.93.0.3.ebuild b/net-im/skype/skype-0.93.0.3.ebuild
new file mode 100644
index 000000000000..2e8917ca9dac
--- /dev/null
+++ b/net-im/skype/skype-0.93.0.3.ebuild
@@ -0,0 +1,97 @@
+# 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"
+}