diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-02 07:25:23 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-02 07:25:23 +0000 |
commit | 2dc504d9a39b79ccab1744e56fe6c9299357b20d (patch) | |
tree | 6db891064a061c6d66bf9287ab0e07da7362748e /net-im/skype | |
parent | Drop old ewarn (diff) | |
download | gentoo-2-2dc504d9a39b79ccab1744e56fe6c9299357b20d.tar.gz gentoo-2-2dc504d9a39b79ccab1744e56fe6c9299357b20d.tar.bz2 gentoo-2-2dc504d9a39b79ccab1744e56fe6c9299357b20d.zip |
Remove last stable version wrt #301924 and #303112.
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'net-im/skype')
-rw-r--r-- | net-im/skype/ChangeLog | 7 | ||||
-rwxr-xr-x | net-im/skype/files/skype-callto-handler | 83 | ||||
-rw-r--r-- | net-im/skype/files/skype.debus.config | 10 | ||||
-rw-r--r-- | net-im/skype/skype-2.0.0.72.ebuild | 104 |
4 files changed, 6 insertions, 198 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index 31466bb1fcc9..ab56e7e7d291 100644 --- a/net-im/skype/ChangeLog +++ b/net-im/skype/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-im/skype # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.109 2010/02/01 17:04:37 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.110 2010/02/02 07:25:23 ssuominen Exp $ + + 02 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> + -skype-2.0.0.72.ebuild, -files/skype.debus.config, + -files/skype-callto-handler: + Remove last stable version wrt #301924 and #303112. 01 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> skype-2.1.0.81.ebuild: Fix x86 runtime deps, thanks to Kacper Kowalik for noticing. diff --git a/net-im/skype/files/skype-callto-handler b/net-im/skype/files/skype-callto-handler deleted file mode 100755 index e4614d754e0c..000000000000 --- a/net-im/skype/files/skype-callto-handler +++ /dev/null @@ -1,83 +0,0 @@ -#!/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/files/skype.debus.config b/net-im/skype/files/skype.debus.config deleted file mode 100644 index 641647fe47c8..000000000000 --- a/net-im/skype/files/skype.debus.config +++ /dev/null @@ -1,10 +0,0 @@ -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - <!-- ../system.conf have denied everything, so we just punch some holes --> - <policy context="default"> - <allow own="com.Skype.API"/> - <allow send_destination="com.Skype.API"/> - <allow receive_sender="com.Skype.API"/> - <allow send_path="/com/Skype"/> - </policy> -</busconfig> diff --git a/net-im/skype/skype-2.0.0.72.ebuild b/net-im/skype/skype-2.0.0.72.ebuild deleted file mode 100644 index ca31453bd99a..000000000000 --- a/net-im/skype/skype-2.0.0.72.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.72.ebuild,v 1.3 2009/04/14 09:38:40 armin76 Exp $ - -EAPI=2 - -inherit eutils qt4 pax-utils - -DESCRIPTION="A P2P-VoiceIP client." -HOMEPAGE="http://www.skype.com/" - -SFILENAME=${PN}_static-${PV}.tar.bz2 -DFILENAME=${P}.tar.bz2 -SRC_URI="!qt-static? ( http://download.skype.com/linux/${DFILENAME} ) - qt-static? ( http://download.skype.com/linux/${SFILENAME} )" - -LICENSE="skype-eula" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="qt-static" -RESTRICT="mirror strip" - -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 - app-emulation/emul-linux-x86-compat ) - x86? ( >=sys-libs/glibc-2.4 - >=media-libs/alsa-lib-1.0.11 - x11-libs/libXScrnSaver - x11-libs/libXv - qt-static? ( media-libs/fontconfig - media-libs/freetype - x11-libs/libICE - x11-libs/libSM - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libX11 ) - !qt-static? ( x11-libs/qt-core:4 - x11-libs/qt-gui:4[accessibility,dbus] - x11-libs/qt-dbus:4 - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp ) )" -RDEPEND="${DEPEND}" - -QA_EXECSTACK="opt/skype/skype" - -use qt-static && S="${WORKDIR}/${PN}_static-${PV}" - -src_install() { - # remove mprotect() restrictions for PaX usage - see Bug 100507 - pax-mark m "${S}"/skype - - exeinto /opt/${PN} - doexe skype - fowners root:audio /opt/skype/skype - make_wrapper skype /opt/${PN}/skype /opt/${PN} /opt/${PN} /usr/bin - - insinto /opt/${PN}/sounds - doins sounds/*.wav - - if ! use qt-static ; then - insinto /etc/dbus-1/system.d - newins "${FILESDIR}"/skype.debus.config skype.conf - fi - - insinto /opt/${PN}/lang - # - #There have been some issues were lang is not updated from the .ts files - #but if we have qt we can rebuild it - # - if ! use qt-static ; then - lrelease lang/*.ts - fi - - doins lang/*.qm - - insinto /opt/${PN}/avatars - doins avatars/*.png - - insinto /opt/${PN} - for X in 16 32 48 - do - insinto /usr/share/icons/hicolor/${X}x${X}/apps - newins "${S}"/icons/SkypeBlue_${X}x${X}.png ${PN}.png - done - - dodoc README - - # insinto /usr/share/applications/ - # doins skype.desktop - make_desktop_entry ${PN} "Skype VoIP" ${PN} "Network;InstantMessaging;Telephony" - - #Fix for no sound notifications - dosym /opt/${PN} /usr/share/${PN} - - # TODO: Optional configuration of callto:// in KDE, Mozilla and friends - # doexe skype-callto-handler -} |