update to the upstream stable

Package-Manager: portage-2.1.1-r1

5 files changed, 16 insertions, 283 deletions

diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index 3e92751ba008..73d121a3f596 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -19,12 +19,10 @@ RMD160 d9b50456f37aa2de8ae9b46b0c2742c22871c3eb files/skype.sh 203
 SHA256 352ffa1b3125e79d35cc2c3c3abf31760ab076b3fc02405d82092739145c22e2 files/skype.sh 203
 DIST skype-1.2.0.18.tar.bz2 7915144
 DIST skype-1.2.0.21-1mdk.i586.rpm 7802660 RMD160 0f76ee645d1e90d52a4478a4397e90c6473f86b0 SHA1 085ee4d9df401463f87e75c0a3e2eceb68c0f6d1 SHA256 c70e7ff0add74ceb1b833398eaa07c5699207845f70ebc0a35414af8ff473b12
+DIST skype-1.3.0.53-generic.tar.bz2 9871707 RMD160 d977d263357e94f7587a91e5691488564e7d36eb SHA1 b76f888e89e7e0ae91a6b8de95260e408bc4def7 SHA256 3eb799ce8351697d523da4ef7631ed55bdbe4a69ca1be974ec619a493a0d6ab0
 DIST skype-avatars-1.0.tgz 377763 RMD160 54f6faeebc6509ebec8418fc27d0b2fbdc383bcf SHA1 7cd8ab6935fe91e4c6f59fd571291a7c5fb56a21 SHA256 de7a9187a99ef7a13bba99c4ad61f6809bbd1e129f6456267b416090e57d71d6
-DIST skype-beta-1.3.0.37.tar.bz2 9875240 RMD160 b83ff6a57a025101c7c9c4393aecb39ac76a29aa SHA1 3a4adf546d3cb29a566e74644054fe6bac72b096 SHA256 eef2999a45292eaa595ea468b9354825dc12698e7e9c4d58f0fc57e74e94d134
-DIST skype-beta-1.3.0.50.tar.bz2 9868092 RMD160 d4c22d0a3a35740506273c72ac8967cc7d8c6b64 SHA1 b8058c7105ad7f6d110b937200939d3a7dd26851 SHA256 f0f9c3be6ab3472f3e321fb7ad6d471e9bf2fa106d867e16b925f76255cb508f
-DIST skype-beta_staticQT-1.3.0.37.tar.bz2 15396667 RMD160 df876528abba169eb8fbe39ff4902e7298ad25fb SHA1 5ebc4858261c527ff7a7b26e8bd31c4ee1415400 SHA256 c0c925e348fbfeb2684870ae8021a6961bea3c81dc308c681b3322c235087348
-DIST skype-beta_staticQT-1.3.0.50.tar.bz2 15099291 RMD160 bdc24b1a9b90c779960179ebf44dd6fbf455fb2e SHA1 85bbfc4da9784f7d5534b136c63829f59458293d SHA256 d1a47519ebad080ca3eccaf88789355ff90144020439bd61f787143fe7597e2c
 DIST skype_staticQT-1.2.0.18.tar.bz2 10678284
+DIST skype_staticQT-1.3.0.53-generic.tar.bz2 15102554 RMD160 3ae225f3a14b0e50b0ed1370418fafef2c3f719e SHA1 7f0195ec48d8fbcb8aaf2282990341459f384f29 SHA256 338230bd3252180bd0079879823e9a0e5316e073295f93e83fcca88f1ac06833
 EBUILD skype-1.2.0.18.ebuild 2945 RMD160 d1526d97964c210086e907263e0ec769696329b7 SHA1 b533fbd12409b53366dd5f048796ebc0e5d5b278 SHA256 ef4e55fc87a3a8c97f154fe212f72d1a34702c66faf6c9dacd02f310055163a8
 MD5 88d6a612953cefa3c823bd2556014782 skype-1.2.0.18.ebuild 2945
 RMD160 d1526d97964c210086e907263e0ec769696329b7 skype-1.2.0.18.ebuild 2945
@@ -33,18 +31,14 @@ EBUILD skype-1.2.0.21-r1.ebuild 3389 RMD160 7c5879b7684f14dcc89f07fb79b1ccb7d095
 MD5 b16d7ddad84406954cda8e998c9a2c70 skype-1.2.0.21-r1.ebuild 3389
 RMD160 7c5879b7684f14dcc89f07fb79b1ccb7d095bb90 skype-1.2.0.21-r1.ebuild 3389
 SHA256 c1be58353a6ced62931e1fcd636ad5c4ad6d9c8d2d2018c9975a23fa610b8e6c skype-1.2.0.21-r1.ebuild 3389
-EBUILD skype-1.3.0.37.ebuild 3279 RMD160 883f6f87137749721afbd784d756945e1936cfb2 SHA1 ca77d8ddc4b4fbdb6f1382a36d43d0277226b361 SHA256 ac0708647fb0d6b81303a1873668d1c14e2a03d7a84abaed348b1c3b99c7da52
-MD5 8e9390a7a433ebcfd9ea9429364cc518 skype-1.3.0.37.ebuild 3279
-RMD160 883f6f87137749721afbd784d756945e1936cfb2 skype-1.3.0.37.ebuild 3279
-SHA256 ac0708647fb0d6b81303a1873668d1c14e2a03d7a84abaed348b1c3b99c7da52 skype-1.3.0.37.ebuild 3279
-EBUILD skype-1.3.0.50.ebuild 3330 RMD160 59a21b47d6bc00cc12abe731e240b1ca88bbd6fa SHA1 6452491203e0cc9e745690db0394b6de540883ff SHA256 c9b6f5d33aeca688fa943e0eeb3a1ce7468deadb6207dc3f10910dfe62a1c0a0
-MD5 ad2fb5224e4badf62b9669d3976055c8 skype-1.3.0.50.ebuild 3330
-RMD160 59a21b47d6bc00cc12abe731e240b1ca88bbd6fa skype-1.3.0.50.ebuild 3330
-SHA256 c9b6f5d33aeca688fa943e0eeb3a1ce7468deadb6207dc3f10910dfe62a1c0a0 skype-1.3.0.50.ebuild 3330
-MISC ChangeLog 11672 RMD160 594aed0b0675283e0b69cb8db12922bcf688591d SHA1 83f73922463f25d90a8090745a2a1720ea2df07d SHA256 f5cddc778cb03941679983ff05762fac6641ff224e3c719ef296fdf996622476
-MD5 6178ffd0c51b6642d38f7d0f216999e1 ChangeLog 11672
-RMD160 594aed0b0675283e0b69cb8db12922bcf688591d ChangeLog 11672
-SHA256 f5cddc778cb03941679983ff05762fac6641ff224e3c719ef296fdf996622476 ChangeLog 11672
+EBUILD skype-1.3.0.53.ebuild 3359 RMD160 e0ccb58045ed9ed3cd2e408747d13f294bb90561 SHA1 6a2a0e5baa21094f437297a70c6ccec790d429e1 SHA256 7f7b4ba6a1d7509103bb98b8012a966b63b32f2ae105d1b55aedf0e9d16d2efb
+MD5 c7e684f2c5232064ca1b3b0d85f494fa skype-1.3.0.53.ebuild 3359
+RMD160 e0ccb58045ed9ed3cd2e408747d13f294bb90561 skype-1.3.0.53.ebuild 3359
+SHA256 7f7b4ba6a1d7509103bb98b8012a966b63b32f2ae105d1b55aedf0e9d16d2efb skype-1.3.0.53.ebuild 3359
+MISC ChangeLog 12001 RMD160 8bf91a49898fa6d64fb48f356bbb426655325617 SHA1 a0636179b86a392581fa2ba5e6e3014ecd39d66b SHA256 66eed36aab10e670945cbc015353383b9ced9342982fc53bf629c152770f3100
+MD5 98176c2b964f96140ce378aa7edb17cf ChangeLog 12001
+RMD160 8bf91a49898fa6d64fb48f356bbb426655325617 ChangeLog 12001
+SHA256 66eed36aab10e670945cbc015353383b9ced9342982fc53bf629c152770f3100 ChangeLog 12001
 MISC metadata.xml 488 RMD160 0dc53516bb6b9f04aad7625aaf8e81f94f288117 SHA1 8e376a6a24f831850ee87a8538c5b3336f6986e2 SHA256 964cb103f057a79a194dea8ef8cd183400daa2d8f7041a57f95f3544b0b0a7a9
 MD5 dbaa6f09202bfea8c248e1f7c222d40f metadata.xml 488
 RMD160 0dc53516bb6b9f04aad7625aaf8e81f94f288117 metadata.xml 488
@@ -55,16 +49,13 @@ SHA256 d1249d15309b8c0b1ddeb48ed43a066dc4d0ca42508f6b804f4c363c0622d4ac files/di
 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 7f6eda894ee4814fac9547f565249960 files/digest-skype-1.3.0.37 804
-RMD160 020737372143d8c84121b1a0003fb9a7ae1c10cd files/digest-skype-1.3.0.37 804
-SHA256 be3f74ae54fde084d4499cbedff394c54eee21794324f7db2953a9685490f74b files/digest-skype-1.3.0.37 804
-MD5 9e695ed57c1ca5f93e8270e0a0d3c7af files/digest-skype-1.3.0.50 804
-RMD160 187df69c57fdebf8a7475f564345b8b112fdb2e9 files/digest-skype-1.3.0.50 804
-SHA256 5153fdaacb9075610162ed122afc6e4f10c35649216eabed3a3134f892a08547 files/digest-skype-1.3.0.50 804
+MD5 ab5b36105b359eb1767d8744cdab9ea0 files/digest-skype-1.3.0.53 822
+RMD160 52043ad46fb7bb6f36c29e765ae24b1cfc471656 files/digest-skype-1.3.0.53 822
+SHA256 2bbcbf2f1b9029baf2c5227bb14f07d47c84c901f506b4625a418190424c4f73 files/digest-skype-1.3.0.53 822
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFIkPF8zY1VwezZiERAucfAJ9RRDfSYhn8mZ9N7vhGYDCIrVOdvgCgkpp6
-0LdCELW4UJeUM75H6YQYIYU=
-=WlDW
+iD8DBQFFJDUZ8zY1VwezZiERAkuXAJ9JJt+FazPgwCBRdgsGrGb0ebrKfQCfQegA
+tpV9lf+bcLeodAREgqF6K+o=
+=fQ/W
 -----END PGP SIGNATURE-----
diff --git a/net-im/skype/files/digest-skype-1.3.0.37 b/net-im/skype/files/digest-skype-1.3.0.37
deleted file mode 100644
index f04dae76c413..000000000000
--- a/net-im/skype/files/digest-skype-1.3.0.37
+++ /dev/null
@@ -1,9 +0,0 @@
-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 894659fafc9ed00b235ec84d3c5d39e4 skype-beta-1.3.0.37.tar.bz2 9875240
-RMD160 b83ff6a57a025101c7c9c4393aecb39ac76a29aa skype-beta-1.3.0.37.tar.bz2 9875240
-SHA256 eef2999a45292eaa595ea468b9354825dc12698e7e9c4d58f0fc57e74e94d134 skype-beta-1.3.0.37.tar.bz2 9875240
-MD5 66d0d12b91115f80256eb3a63fb93b17 skype-beta_staticQT-1.3.0.37.tar.bz2 15396667
-RMD160 df876528abba169eb8fbe39ff4902e7298ad25fb skype-beta_staticQT-1.3.0.37.tar.bz2 15396667
-SHA256 c0c925e348fbfeb2684870ae8021a6961bea3c81dc308c681b3322c235087348 skype-beta_staticQT-1.3.0.37.tar.bz2 15396667
diff --git a/net-im/skype/files/digest-skype-1.3.0.50 b/net-im/skype/files/digest-skype-1.3.0.50
deleted file mode 100644
index bfee4f44af51..000000000000
--- a/net-im/skype/files/digest-skype-1.3.0.50
+++ /dev/null
@@ -1,9 +0,0 @@
-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 0adf318536892639f90b78c3f2ea6228 skype-beta-1.3.0.50.tar.bz2 9868092
-RMD160 d4c22d0a3a35740506273c72ac8967cc7d8c6b64 skype-beta-1.3.0.50.tar.bz2 9868092
-SHA256 f0f9c3be6ab3472f3e321fb7ad6d471e9bf2fa106d867e16b925f76255cb508f skype-beta-1.3.0.50.tar.bz2 9868092
-MD5 97668e2671936fd7f2a8a3520279ea89 skype-beta_staticQT-1.3.0.50.tar.bz2 15099291
-RMD160 bdc24b1a9b90c779960179ebf44dd6fbf455fb2e skype-beta_staticQT-1.3.0.50.tar.bz2 15099291
-SHA256 d1a47519ebad080ca3eccaf88789355ff90144020439bd61f787143fe7597e2c skype-beta_staticQT-1.3.0.50.tar.bz2 15099291
diff --git a/net-im/skype/skype-1.3.0.37.ebuild b/net-im/skype/skype-1.3.0.37.ebuild
deleted file mode 100644
index fa7af7ed591f..000000000000
--- a/net-im/skype/skype-1.3.0.37.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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.37.ebuild,v 1.2 2006/10/03 00:12:52 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}-beta
-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}.tar.bz2 )
-		static? ( http://download.skype.com/linux/${MY_PN}_staticQT-${PV}.tar.bz2 )"
-
-LICENSE="skype-eula"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="static"
-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
-		!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}.tar.bz2
-	else
-		unpack ${MY_PN}-${PV}.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 ""
-
-}
diff --git a/net-im/skype/skype-1.3.0.50.ebuild b/net-im/skype/skype-1.3.0.50.ebuild
deleted file mode 100644
index 0d207bca9c2e..000000000000
--- a/net-im/skype/skype-1.3.0.50.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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.50.ebuild,v 1.2 2006/10/03 11:01:44 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}-beta
-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}.tar.bz2 )
-		static? ( http://download.skype.com/linux/${MY_PN}_staticQT-${PV}.tar.bz2 )"
-
-LICENSE="skype-eula"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="static"
-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}.tar.bz2
-	else
-		unpack ${MY_PN}-${PV}.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 ""
-
-}