first try at fix the scim issue

(Portage version: 2.1.1-r1)
 (Signed Manifest commit)

3 files changed, 18 insertions, 149 deletions

diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index 73d121a3f596..e166cf46387c 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -13,10 +13,10 @@ AUX skype.debus.config 436 RMD160 ec47725458e05cca8e37316989f473963b5b654d SHA1
 MD5 5105ec59acb037592219bdc10c0f09b7 files/skype.debus.config 436
 RMD160 ec47725458e05cca8e37316989f473963b5b654d files/skype.debus.config 436
 SHA256 6de68b9e62afd284f1d7d5899fc5747de2be2c18a96022130826917625941ea2 files/skype.debus.config 436
-AUX skype.sh 203 RMD160 d9b50456f37aa2de8ae9b46b0c2742c22871c3eb SHA1 71af2c127795392466fb7591f5b554ff327039ba SHA256 352ffa1b3125e79d35cc2c3c3abf31760ab076b3fc02405d82092739145c22e2
-MD5 18e4bf4221c780da5662eeacec9a56b9 files/skype.sh 203
-RMD160 d9b50456f37aa2de8ae9b46b0c2742c22871c3eb files/skype.sh 203
-SHA256 352ffa1b3125e79d35cc2c3c3abf31760ab076b3fc02405d82092739145c22e2 files/skype.sh 203
+AUX skype.sh 243 RMD160 994fb89dc4c9e5f205de1d552695a0f63a184fb3 SHA1 a973105cc69d7add1978d0fb11800349a34431c1 SHA256 cbd934a18023e014ca34b78b33fbbeb3ddd340f14c79619871c3a39395b91594
+MD5 9f09d663c4edd88c6a2097f3990213eb files/skype.sh 243
+RMD160 994fb89dc4c9e5f205de1d552695a0f63a184fb3 files/skype.sh 243
+SHA256 cbd934a18023e014ca34b78b33fbbeb3ddd340f14c79619871c3a39395b91594 files/skype.sh 243
 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
@@ -31,14 +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.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
+EBUILD skype-1.3.0.53-r1.ebuild 3567 RMD160 11cfd248e9f6c6ac07acec487ea6ec896b8f730b SHA1 c951b7244d1b3314e685a5fd8bdfc8a5df0c04b7 SHA256 4a616930cda05b1316c76d31fac149c9a6163718c0db90eafed38d2148e86a8f
+MD5 95a21db32a451d4f7da139d5438c5df3 skype-1.3.0.53-r1.ebuild 3567
+RMD160 11cfd248e9f6c6ac07acec487ea6ec896b8f730b skype-1.3.0.53-r1.ebuild 3567
+SHA256 4a616930cda05b1316c76d31fac149c9a6163718c0db90eafed38d2148e86a8f skype-1.3.0.53-r1.ebuild 3567
+MISC ChangeLog 12322 RMD160 0af40b472eb90e2a2481923db3470958af4b59c9 SHA1 00864abd52032026d0ac0e425392e2feeedebe67 SHA256 bcda8746552a427b0028c1f0209ff7a16b49c44180f0ee5d23221c4bb4755181
+MD5 9de7ca52365916218be7f37a4e57c9dc ChangeLog 12322
+RMD160 0af40b472eb90e2a2481923db3470958af4b59c9 ChangeLog 12322
+SHA256 bcda8746552a427b0028c1f0209ff7a16b49c44180f0ee5d23221c4bb4755181 ChangeLog 12322
 MISC metadata.xml 488 RMD160 0dc53516bb6b9f04aad7625aaf8e81f94f288117 SHA1 8e376a6a24f831850ee87a8538c5b3336f6986e2 SHA256 964cb103f057a79a194dea8ef8cd183400daa2d8f7041a57f95f3544b0b0a7a9
 MD5 dbaa6f09202bfea8c248e1f7c222d40f metadata.xml 488
 RMD160 0dc53516bb6b9f04aad7625aaf8e81f94f288117 metadata.xml 488
@@ -49,13 +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 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
+MD5 ab5b36105b359eb1767d8744cdab9ea0 files/digest-skype-1.3.0.53-r1 822
+RMD160 52043ad46fb7bb6f36c29e765ae24b1cfc471656 files/digest-skype-1.3.0.53-r1 822
+SHA256 2bbcbf2f1b9029baf2c5227bb14f07d47c84c901f506b4625a418190424c4f73 files/digest-skype-1.3.0.53-r1 822
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJDUZ8zY1VwezZiERAkuXAJ9JJt+FazPgwCBRdgsGrGb0ebrKfQCfQegA
-tpV9lf+bcLeodAREgqF6K+o=
-=fQ/W
+iD8DBQFFN4Fo8zY1VwezZiERAkXFAJ9x4h2PY/73sfA4MnrLVak+/1QhQgCgoHFt
+yVyYoiszOzixc2lsBycip88=
+=x0uh
 -----END PGP SIGNATURE-----
diff --git a/net-im/skype/files/digest-skype-1.3.0.53 b/net-im/skype/files/digest-skype-1.3.0.53
deleted file mode 100644
index dc3bdffeb8bc..000000000000
--- a/net-im/skype/files/digest-skype-1.3.0.53
+++ /dev/null
@@ -1,9 +0,0 @@
-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/skype-1.3.0.53.ebuild b/net-im/skype/skype-1.3.0.53.ebuild
deleted file mode 100644
index 9cd00fff2468..000000000000
--- a/net-im/skype/skype-1.3.0.53.ebuild
+++ /dev/null
@@ -1,122 +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.53.ebuild,v 1.1 2006/10/04 22:26:18 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"
-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
-		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 ""
-
-}