diff options
author | Gustavo Felisberto <humpback@gentoo.org> | 2006-10-19 13:40:49 +0000 |
---|---|---|
committer | Gustavo Felisberto <humpback@gentoo.org> | 2006-10-19 13:40:49 +0000 |
commit | e26cb66bd93fd2f474738486bb89a5f141bd6520 (patch) | |
tree | 81b98d5e8c3801ea5fdfe2f759d1fd2099b82903 /net-im/skype | |
parent | removed from tree (diff) | |
download | historical-e26cb66bd93fd2f474738486bb89a5f141bd6520.tar.gz historical-e26cb66bd93fd2f474738486bb89a5f141bd6520.tar.bz2 historical-e26cb66bd93fd2f474738486bb89a5f141bd6520.zip |
first try at fix the scim issue
Package-Manager: portage-2.1.1-r1
Diffstat (limited to 'net-im/skype')
-rw-r--r-- | net-im/skype/ChangeLog | 10 | ||||
-rw-r--r-- | net-im/skype/files/digest-skype-1.3.0.53-r1 | 9 | ||||
-rw-r--r-- | net-im/skype/files/skype.sh | 2 | ||||
-rw-r--r-- | net-im/skype/skype-1.3.0.53-r1.ebuild | 129 |
4 files changed, 148 insertions, 2 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index f8320a961971..a280ab9b93c9 100644 --- a/net-im/skype/ChangeLog +++ b/net-im/skype/ChangeLog @@ -1,6 +1,14 @@ # 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.61 2006/10/04 22:26:18 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.62 2006/10/19 13:40:49 humpback Exp $ + +*skype-1.3.0.53-r1 (19 Oct 2006) + + 19 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>; files/skype.sh, + -skype-1.3.0.53.ebuild, +skype-1.3.0.53-r1.ebuild: + Fixed some issues where skype would crash with SCIM. Now it no longer + crashes but the is no cjk input. This is an upstream issue that is being + worked on. *skype-1.3.0.53 (04 Oct 2006) diff --git a/net-im/skype/files/digest-skype-1.3.0.53-r1 b/net-im/skype/files/digest-skype-1.3.0.53-r1 new file mode 100644 index 000000000000..dc3bdffeb8bc --- /dev/null +++ b/net-im/skype/files/digest-skype-1.3.0.53-r1 @@ -0,0 +1,9 @@ +MD5 e288e398e4a34a5760ff6321b253ed08 skype-1.3.0.53-generic.tar.bz2 9871707 +RMD160 d977d263357e94f7587a91e5691488564e7d36eb skype-1.3.0.53-generic.tar.bz2 9871707 +SHA256 3eb799ce8351697d523da4ef7631ed55bdbe4a69ca1be974ec619a493a0d6ab0 skype-1.3.0.53-generic.tar.bz2 9871707 +MD5 5b3195993d01ed0d439a28b505665382 skype-avatars-1.0.tgz 377763 +RMD160 54f6faeebc6509ebec8418fc27d0b2fbdc383bcf skype-avatars-1.0.tgz 377763 +SHA256 de7a9187a99ef7a13bba99c4ad61f6809bbd1e129f6456267b416090e57d71d6 skype-avatars-1.0.tgz 377763 +MD5 9ca128f45c73cd76862260bc6b9f196c skype_staticQT-1.3.0.53-generic.tar.bz2 15102554 +RMD160 3ae225f3a14b0e50b0ed1370418fafef2c3f719e skype_staticQT-1.3.0.53-generic.tar.bz2 15102554 +SHA256 338230bd3252180bd0079879823e9a0e5316e073295f93e83fcca88f1ac06833 skype_staticQT-1.3.0.53-generic.tar.bz2 15102554 diff --git a/net-im/skype/files/skype.sh b/net-im/skype/files/skype.sh index 050f7b02daf9..6c78c9ad3191 100644 --- a/net-im/skype/files/skype.sh +++ b/net-im/skype/files/skype.sh @@ -8,4 +8,4 @@ progopts="--resources-path ${progpath}" #Going to "homedir" cd ${progpath} skypecmd="${progpath}${progname}" -exec ${skypecmd} ${progopts} $@ +XMODIFIERS=@im=none QT_IM_MODULE=simple exec ${skypecmd} ${progopts} $@ diff --git a/net-im/skype/skype-1.3.0.53-r1.ebuild b/net-im/skype/skype-1.3.0.53-r1.ebuild new file mode 100644 index 000000000000..6e988e692d7d --- /dev/null +++ b/net-im/skype/skype-1.3.0.53-r1.ebuild @@ -0,0 +1,129 @@ +# 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.3.0.53-r1.ebuild,v 1.1 2006/10/19 13:40:49 humpback Exp $ + +inherit eutils qt3 + + +#If you want to know when this package will be marked stable please see the Changelog +RESTRICT="nomirror nostrip" +AVATARV="1.0" +DESCRIPTION="${PN} is a P2P-VoiceIP client." +MY_PN=${PN} +HOMEPAGE="http://www.skype.com/" +SRC_URI="http://dev.gentoo.org/~humpback/skype-avatars-${AVATARV}.tgz + !static? ( http://download.skype.com/linux/${MY_PN}-${PV}-generic.tar.bz2 ) + static? ( + http://download.skype.com/linux/${MY_PN}_staticQT-${PV}-generic.tar.bz2 )" + +LICENSE="skype-eula" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="static cjk" +DEPEND=" + amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.2 + >=app-emulation/emul-linux-x86-baselibs-2.1.1 + >=app-emulation/emul-linux-x86-soundlibs-2.4 + !static? ( >=app-emulation/emul-linux-x86-qtlibs-1.1 ) ) + x86? ( >=sys-libs/glibc-2.3.2 + >=media-libs/alsa-lib-1.0.11 + virtual/libstdc++ + !static? ( $(qt_min_version 3.2) ) )" +RDEPEND="${DEPEND} + >=sys-apps/dbus-0.23.4" + +QA_EXECSTACK_x86="opt/skype/skype" +QA_EXECSTACK_amd64="opt/skype/skype" + +src_unpack() { + if use static; + then + unpack ${MY_PN}_staticQT-${PV}-generic.tar.bz2 + else + if use cjk; + then + ewarn "If you use scim to have Multi-byte character's in QT" + ewarn "applications you will not be able to input cjk. This is a" + ewarn "know upstream issue" + sleep 5 + fi + unpack ${MY_PN}-${PV}-generic.tar.bz2 + fi + cd ${P} + unpack skype-avatars-${AVATARV}.tgz + +} + +src_install() { + ## Install the wrapper script + #mv skype skype + #cp ${FILESDIR}/sDaemonWrapper-r1 skype + + # remove mprotect() restrictions for PaX usage - see Bug 100507 + [[ -x /sbin/chpax ]] && /sbin/chpax -m skype + + dodir /opt/${PN} + exeopts -m0755 + exeinto /opt/${PN} + doexe skype + doexe ${FILESDIR}/skype.sh + dosym /opt/skype/skype.sh /usr/bin/skype + + 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 + newins ${FILESDIR}/skype.debus.config skype.conf + + insinto /opt/${PN}/avatars + doins avatars/*.jpg + + insinto /opt/${PN} + 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 + + # The skype icon doesn't show up in gnome for some reason + # Putting the icon in /usr/share/pixmaps seems to solve it + insinto /usr/share/pixmaps + newins ${S}/icons/${PN}_48_32.png ${PN}.png + + fowners root:audio /opt/skype/skype + fowners root:audio /opt/skype/skype-callto-handler + + insinto /usr/share/applications/ + doins skype.desktop + + dodir /usr/bin/ + # 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" + # This will always be true in future, since skype stores the contacts in + # the peer-to-peer network. + ewarn "If you are upgrading and skype does not autologin do a manual login" + ewarn "you will not lose your contacts." + + ewarn "" + ewarn "This release no longer uses the old wrapper because skype now uses + ALSA" + ewarn "" + +} |