revision bump and removed older (security problematic) versions

(Portage version: 2.0.51.22-r2)

15 files changed, 13 insertions, 562 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index 011791e36f07..90a0a1420167 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/skype
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.44 2005/08/13 00:43:36 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.45 2005/08/16 14:15:19 humpback Exp $
+
+*skype-1.2.0.11-r1 (16 Aug 2005)
+
+  16 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  -files/sDaemonWrapper, -skype-1.1.0.3.ebuild, -skype-1.1.0.3-r1.ebuild,
+  -skype-1.1.0.13.ebuild, -skype-1.1.0.20.ebuild, -skype-1.1.0.20-r1.ebuild,
+  -skype-1.2.0.11.ebuild, +skype-1.2.0.11-r1.ebuild:
+  Revision bump to force use of wrapper script. WE SHOULD ALWAYS USE OUR
+  WRAPPER SCRIPT OR ALL SORT OF BUGS WILL APPEAR.
 
   13 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
   files/sDaemonWrapper-r1, skype-1.2.0.11.ebuild:
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index 751a35aba25f..898c7fee29ea 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -1,12 +1,13 @@
 MD5 7a77aef36d72b428a798026106314da1 skype-1.1.0.20.ebuild 2981
 MD5 982e11a41cec6c3914d763f4d2e1d6c8 skype-1.1.0.13.ebuild 2981
 MD5 db6138e9f1c3f6ece7c686dd00c7b792 skype-1.1.0.20-r1.ebuild 2987
-MD5 2c8bc5b8a048da127543f39aaba51c5f skype-1.2.0.11.ebuild 2987
 MD5 1741039a31320efdcea62457b1f16822 skype-1.1.0.3.ebuild 2756
 MD5 5bd398238feee26ddcb938304182df83 skype-1.1.0.3-r1.ebuild 2838
+MD5 2c8bc5b8a048da127543f39aaba51c5f skype-1.2.0.11-r1.ebuild 2987
 MD5 6be35d1589437ffd74aa3cac0f245877 ChangeLog 8354
 MD5 dbaa6f09202bfea8c248e1f7c222d40f metadata.xml 488
 MD5 0fd51a0eb686552fb6ec45a0bc151d75 files/digest-skype-1.1.0.3 209
+MD5 ee77a8f132435fc5acd0d4291c24262e files/digest-skype-1.2.0.11-r1 211
 MD5 5105ec59acb037592219bdc10c0f09b7 files/skype.debus.config 436
 MD5 3ebd302142d17df643fa2055d99d0fc7 files/sDaemonWrapper 1740
 MD5 0fd51a0eb686552fb6ec45a0bc151d75 files/digest-skype-1.1.0.3-r1 209
@@ -14,4 +15,3 @@ MD5 2f99781e0fd376273f0023b5320e56f1 files/sDaemonWrapper-r1 2019
 MD5 25e2e1abc5814695e1a6d9691fe61b5d files/digest-skype-1.1.0.20-r1 211
 MD5 38aacc11c3b797c1f3b6008b73fcc881 files/digest-skype-1.1.0.13 211
 MD5 25e2e1abc5814695e1a6d9691fe61b5d files/digest-skype-1.1.0.20 211
-MD5 ee77a8f132435fc5acd0d4291c24262e files/digest-skype-1.2.0.11 211
diff --git a/net-im/skype/files/digest-skype-1.1.0.13 b/net-im/skype/files/digest-skype-1.1.0.13
deleted file mode 100644
index 742cfbded618..000000000000
--- a/net-im/skype/files/digest-skype-1.1.0.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5b3195993d01ed0d439a28b505665382 skype-avatars-1.0.tgz 377763
-MD5 7719a0e4a6c6439901ab80883310d67f skype-1.1.0.13.tar.bz2 6388305
-MD5 2d49a9217c58046fdd4e933ce8244788 skype_staticQT-1.1.0.13.tar.bz2 9135274
diff --git a/net-im/skype/files/digest-skype-1.1.0.20 b/net-im/skype/files/digest-skype-1.1.0.20
deleted file mode 100644
index 8639dc73861c..000000000000
--- a/net-im/skype/files/digest-skype-1.1.0.20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5b3195993d01ed0d439a28b505665382 skype-avatars-1.0.tgz 377763
-MD5 3dda77f8f4d12157f91c2cc18da4fb1c skype-1.1.0.20.tar.bz2 6426139
-MD5 f100bd33f6cc31c7c7ebfd5010255c6c skype_staticQT-1.1.0.20.tar.bz2 9180204
diff --git a/net-im/skype/files/digest-skype-1.1.0.20-r1 b/net-im/skype/files/digest-skype-1.1.0.20-r1
deleted file mode 100644
index 8639dc73861c..000000000000
--- a/net-im/skype/files/digest-skype-1.1.0.20-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5b3195993d01ed0d439a28b505665382 skype-avatars-1.0.tgz 377763
-MD5 3dda77f8f4d12157f91c2cc18da4fb1c skype-1.1.0.20.tar.bz2 6426139
-MD5 f100bd33f6cc31c7c7ebfd5010255c6c skype_staticQT-1.1.0.20.tar.bz2 9180204
diff --git a/net-im/skype/files/digest-skype-1.1.0.3 b/net-im/skype/files/digest-skype-1.1.0.3
deleted file mode 100644
index 60e873cdff0e..000000000000
--- a/net-im/skype/files/digest-skype-1.1.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5b3195993d01ed0d439a28b505665382 skype-avatars-1.0.tgz 377763
-MD5 8b0a7778c789528c2e7a4057d113d013 skype-1.1.0.3.tar.bz2 5811153
-MD5 82d929b6e77d4768a0ff1171bbf21425 skype_staticQT-1.1.0.3.tar.bz2 8850231
diff --git a/net-im/skype/files/digest-skype-1.1.0.3-r1 b/net-im/skype/files/digest-skype-1.1.0.3-r1
deleted file mode 100644
index 60e873cdff0e..000000000000
--- a/net-im/skype/files/digest-skype-1.1.0.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5b3195993d01ed0d439a28b505665382 skype-avatars-1.0.tgz 377763
-MD5 8b0a7778c789528c2e7a4057d113d013 skype-1.1.0.3.tar.bz2 5811153
-MD5 82d929b6e77d4768a0ff1171bbf21425 skype_staticQT-1.1.0.3.tar.bz2 8850231
diff --git a/net-im/skype/files/digest-skype-1.2.0.11 b/net-im/skype/files/digest-skype-1.2.0.11-r1
index a392ac371c18..a392ac371c18 100644
--- a/net-im/skype/files/digest-skype-1.2.0.11
+++ b/net-im/skype/files/digest-skype-1.2.0.11-r1
diff --git a/net-im/skype/files/sDaemonWrapper b/net-im/skype/files/sDaemonWrapper
deleted file mode 100644
index b09074bf3bc3..000000000000
--- a/net-im/skype/files/sDaemonWrapper
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/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}"
-shellcheck1=` which artsshell 2> /dev/null `
-shellcheck2=` which esd 2> /dev/null `
-artsdcheck=` ps x | grep artsd | grep -v grep `
-## We use ps ax for esd as esd can be used globaly for all users.
-esdcheck=` ps ax | grep "esd ." | grep -v grep `
-skypecmd="${progpath}${progname}.bin"
-wrapsound="yes"
-
-[ "$1" == "oss" ] && wrapsound="no"
-
-[ -d "$(dirname "${logfile}")" ] || mkdir "$(dirname "${logfile}")"
-
-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" | tee --append "${logfile}"
-else
-	if [[ ${wrapsound} == "yes" && ${shellcheck1} == $(artsc-config --arts-prefix)/bin/artsshell && -n ${artsdcheck} ]]
-	then
-		echo "Running artsd found"
-		echo "Starting artsd wrapped ${progname}" | tee --append "${logfile}"
-		skypecmd="artsdsp -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}"
-	else
-		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" | tee --append "${logfile}"
-	fi
-fi
-
-echo "${skypecmd} ${progopts}" >> ${logfile}
-echo "=========================================="
-${skypecmd} ${progopts} >> ${logfile} 2>> ${logfile}
-
-exit $?
diff --git a/net-im/skype/skype-1.1.0.13.ebuild b/net-im/skype/skype-1.1.0.13.ebuild
deleted file mode 100644
index ed264266f3a7..000000000000
--- a/net-im/skype/skype-1.1.0.13.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.1.0.13.ebuild,v 1.5 2005/07/25 17:49:09 caleb Exp $
-
-inherit eutils qt3
-
-
-#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
-		!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-1.2
-		>=app-emulation/emul-linux-x86-baselibs-2.1.1
-		!static? ( >=app-emulation/emul-linux-x86-qtlibs-1.1 ) )
-	x86? ( !static? ( $(qt_min_version 3.2) )
-		>=sys-libs/glibc-2.3.2 )"
-RDEPEND="${DEPEND}
-	>=sys-apps/dbus-0.23.4"
-
-src_unpack() {
-	if use static;
-		then
-		unpack ${PN}_staticQT-${PV}.tar.bz2
-		mv ${PN}_staticQT-${PV} ${S}
-	else
-		unpack ${P}.tar.bz2
-	fi
-	cd ${P}
-	unpack skype-avatars-${AVATARV}.tgz
-}
-
-src_install() {
-	## Install the wrapper script
-	mv skype skype.bin
-	cp ${FILESDIR}/sDaemonWrapper skype
-
-	dodir /opt/${PN}
-	exeopts -m0755
-	exeinto /opt/${PN}
-	doexe skype
-	doexe skype.bin
-	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
-	doins skype.conf
-
-	insinto /opt/${PN}/avatars
-	doins avatars/*.jpg
-
-	insinto /opt/${PN}
-	make_desktop_entry skype "Skype VoIP" skype
-	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
-	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
-	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."
-}
diff --git a/net-im/skype/skype-1.1.0.20-r1.ebuild b/net-im/skype/skype-1.1.0.20-r1.ebuild
deleted file mode 100644
index 02a8dba1610b..000000000000
--- a/net-im/skype/skype-1.1.0.20-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.1.0.20-r1.ebuild,v 1.2 2005/07/25 17:49:09 caleb Exp $
-
-inherit eutils qt3
-
-
-#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
-		!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-1.2
-		>=app-emulation/emul-linux-x86-baselibs-2.1.1
-		!static? ( >=app-emulation/emul-linux-x86-qtlibs-1.1 ) )
-	x86? ( !static? ( $(qt_min_version 3.2) )
-		>=sys-libs/glibc-2.3.2 )"
-RDEPEND="${DEPEND}
-	>=sys-apps/dbus-0.23.4"
-
-src_unpack() {
-	if use static;
-		then
-		unpack ${PN}_staticQT-${PV}.tar.bz2
-		mv ${PN}_staticQT-${PV} ${S}
-	else
-		unpack ${P}.tar.bz2
-	fi
-	cd ${P}
-	unpack skype-avatars-${AVATARV}.tgz
-}
-
-src_install() {
-	## Install the wrapper script
-	mv skype skype.bin
-	cp ${FILESDIR}/sDaemonWrapper-r1 skype
-
-	dodir /opt/${PN}
-	exeopts -m0755
-	exeinto /opt/${PN}
-	doexe skype
-	doexe skype.bin
-	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
-	doins skype.conf
-
-	insinto /opt/${PN}/avatars
-	doins avatars/*.jpg
-
-	insinto /opt/${PN}
-	make_desktop_entry skype "Skype VoIP" skype
-	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
-	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
-	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."
-}
diff --git a/net-im/skype/skype-1.1.0.20.ebuild b/net-im/skype/skype-1.1.0.20.ebuild
deleted file mode 100644
index 2923f1c84b3b..000000000000
--- a/net-im/skype/skype-1.1.0.20.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.1.0.20.ebuild,v 1.2 2005/07/25 17:49:09 caleb Exp $
-
-inherit eutils qt3
-
-
-#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
-		!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-1.2
-		>=app-emulation/emul-linux-x86-baselibs-2.1.1
-		!static? ( >=app-emulation/emul-linux-x86-qtlibs-1.1 ) )
-	x86? ( !static? ( $(qt_min_version 3.2) )
-		>=sys-libs/glibc-2.3.2 )"
-RDEPEND="${DEPEND}
-	>=sys-apps/dbus-0.23.4"
-
-src_unpack() {
-	if use static;
-		then
-		unpack ${PN}_staticQT-${PV}.tar.bz2
-		mv ${PN}_staticQT-${PV} ${S}
-	else
-		unpack ${P}.tar.bz2
-	fi
-	cd ${P}
-	unpack skype-avatars-${AVATARV}.tgz
-}
-
-src_install() {
-	## Install the wrapper script
-	mv skype skype.bin
-	cp ${FILESDIR}/sDaemonWrapper skype
-
-	dodir /opt/${PN}
-	exeopts -m0755
-	exeinto /opt/${PN}
-	doexe skype
-	doexe skype.bin
-	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
-	doins skype.conf
-
-	insinto /opt/${PN}/avatars
-	doins avatars/*.jpg
-
-	insinto /opt/${PN}
-	make_desktop_entry skype "Skype VoIP" skype
-	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
-	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
-	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."
-}
diff --git a/net-im/skype/skype-1.1.0.3-r1.ebuild b/net-im/skype/skype-1.1.0.3-r1.ebuild
deleted file mode 100644
index 0b0616497721..000000000000
--- a/net-im/skype/skype-1.1.0.3-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.1.0.3-r1.ebuild,v 1.4 2005/07/25 17:49:09 caleb Exp $
-
-inherit eutils qt3
-
-
-#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
-		!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="=sys-apps/dbus-0.23*
-	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? ( !static? ( $(qt_min_version 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
-	cd ${P}
-	unpack skype-avatars-${AVATARV}.tgz
-}
-
-src_install() {
-	## Install the wrapper script
-	mv skype skype.bin
-	cp ${FILESDIR}/sDaemonWrapper skype
-
-	dodir /opt/${PN}
-	exeopts -m0755
-	exeinto /opt/${PN}
-	doexe skype
-	doexe skype.bin
-	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}
-	make_desktop_entry skype "Skype VoIP" skype
-	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
-	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 "If you are upgrading and skype does not autologin do a manual login"
-	ewarn "you will not lose your contacts."
-}
diff --git a/net-im/skype/skype-1.1.0.3.ebuild b/net-im/skype/skype-1.1.0.3.ebuild
deleted file mode 100644
index ae4238e96641..000000000000
--- a/net-im/skype/skype-1.1.0.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.1.0.3.ebuild,v 1.5 2005/07/25 17:49:09 caleb Exp $
-
-inherit eutils qt3
-
-
-#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
-		!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=">=sys-apps/dbus-0.23.4
-	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? ( !static? ( $(qt_min_version 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
-	cd ${P}
-	unpack skype-avatars-${AVATARV}.tgz
-}
-
-src_install() {
-	## Install the wrapper script
-	mv skype skype.bin
-	cp ${FILESDIR}/sDaemonWrapper skype
-
-	dodir /opt/${PN}
-	exeopts -m0755
-	exeinto /opt/${PN}
-	doexe skype
-	doexe skype.bin
-	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 /opt/${PN}/avatars
-	doins avatars/*.jpg
-
-	insinto /opt/${PN}
-	make_desktop_entry skype "Skype VoIP" skype
-	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
-	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 "If you are upgrading and skype does not autologin do a manual login"
-	ewarn "you will not lose your contacts."
-}
diff --git a/net-im/skype/skype-1.2.0.11.ebuild b/net-im/skype/skype-1.2.0.11-r1.ebuild
index 2bfa7d675f27..53902ca941c2 100644
--- a/net-im/skype/skype-1.2.0.11.ebuild
+++ b/net-im/skype/skype-1.2.0.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.11.ebuild,v 1.2 2005/08/13 00:43:36 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.2.0.11-r1.ebuild,v 1.1 2005/08/16 14:15:19 humpback Exp $
 
 inherit eutils qt3