Bumped version

6 files changed, 59 insertions, 37 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index a6dac368274e..c22f1b75a79a 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/skype
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.69 2007/05/23 09:07:55 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.70 2007/05/23 14:32:56 humpback Exp $
+
+*skype-1.4.0.64_alpha (23 May 2007)
+
+  23 May 2007; <humpback@gentoo.org> +files/99skype,
+  -skype-1.4.0.58_alpha.ebuild, +skype-1.4.0.64_alpha.ebuild:
+  Re-added amd64 keyword because of added libsig32. Bumped to new Alpha
+  release. Removed older Alpha release.
 
   23 May 2007; Timothy Redaelli <drizzt@gentoo.org>
   skype-1.4.0.58_alpha.ebuild:
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index 1fc64b4d8bbf..aa35f2d5b93d 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 99skype 18 RMD160 4e697f95ee2c58eb3039603970af92200565c1ef SHA1 1ae9c7ac00243d6c3ba4504b4ff4cb9b1c290ac2 SHA256 d96ed414357a399ac9eb84a879f3e60da47ecc100e4b2bd0e587a571f5001e9a
+MD5 9ff5bea8481389ae61a390dfbc319c04 files/99skype 18
+RMD160 4e697f95ee2c58eb3039603970af92200565c1ef files/99skype 18
+SHA256 d96ed414357a399ac9eb84a879f3e60da47ecc100e4b2bd0e587a571f5001e9a files/99skype 18
 AUX sDaemonWrapper-r1 2156 RMD160 29aa71c39c0e6049d9073f1a37b4548d76195248 SHA1 c2fe043de8bf0eb7e5666b90ab849710d16aa72f SHA256 997724ef746507af4f2255ee33d93316101dd072388807103cab98172282a4a8
 MD5 d935b48b3432eece5fd029cdc6158669 files/sDaemonWrapper-r1 2156
 RMD160 29aa71c39c0e6049d9073f1a37b4548d76195248 files/sDaemonWrapper-r1 2156
@@ -17,11 +18,12 @@ AUX skype.sh 243 RMD160 994fb89dc4c9e5f205de1d552695a0f63a184fb3 SHA1 a973105cc6
 MD5 9f09d663c4edd88c6a2097f3990213eb files/skype.sh 243
 RMD160 994fb89dc4c9e5f205de1d552695a0f63a184fb3 files/skype.sh 243
 SHA256 cbd934a18023e014ca34b78b33fbbeb3ddd340f14c79619871c3a39395b91594 files/skype.sh 243
+DIST libsigc++20-2.0.17-1-from-fc5.rf.i386.tar.gz 7845 RMD160 e66d772cc6548fce1681febab7fbfa0846c9b910 SHA1 a3a048249c0eaef77bd7bce28cf0f98c42327c21 SHA256 066422155ddb13eb6882fcd8d253460edcf4ee3961706ff027be90136aee7d56
 DIST skype-1.2.0.18.tar.bz2 7915144 RMD160 3aab2d168667032d3e0da2c735d99f2f03f9d103 SHA1 9621f59e07358a4c97a112899c365c05d249d2fb SHA256 373c2bb69da8ba231281d24d61d2c35bdfefa2fb8ca556a9c06120194b470a0d
 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-alpha-1.4.0.58-generic.tar.bz2 11273689 RMD160 593012f065ee07a438749e93123a533add269e9f SHA1 abd43c43675074b8d60a1a2855be418a2624446a SHA256 f0da9f3f13b0cf71c8e574e95d0b5c1c408c83f46cef5ba8b5d162505bc7d2b8
-DIST skype-alpha_staticQT-1.4.0.58-generic.tar.bz2 17003818 RMD160 5e89d1e36c2d3ca3986cf5239efcb47ec4c7b257 SHA1 6689a654573d64d6ad0095889b3f972df5ac0d9d SHA256 198bd939f0901ad95736d8bcb4e1203d34915d47d36c4a40acbc9fec19a8b159
+DIST skype-alpha-1.4.0.64-generic.tar.bz2 11430696 RMD160 21c44d631b4ff22093c90791d240545695a5d241 SHA1 34b1de1abd82f1d5c299d5296abeeef5fa12a3b9 SHA256 619a4870e5a1dc45f07550c7c442ff9d5ecf00bab9379a0ae266c70a4283de5c
+DIST skype-alpha_staticQT-1.4.0.64-generic.tar.bz2 17589417 RMD160 3f36dd06cd5db870762bc7f684cce57906b9820d SHA1 1af9d8f8517af8ea2be84201663f1211c19642c1 SHA256 42abc17e2baef1d7aba184569dd4ebe35049e84aff8ec6eba62442bc413d6bc7
 DIST skype-avatars-1.0.tgz 377763 RMD160 54f6faeebc6509ebec8418fc27d0b2fbdc383bcf SHA1 7cd8ab6935fe91e4c6f59fd571291a7c5fb56a21 SHA256 de7a9187a99ef7a13bba99c4ad61f6809bbd1e129f6456267b416090e57d71d6
 DIST skype_staticQT-1.2.0.18.tar.bz2 10678284 RMD160 057f858ecd95ad01727d3643a4d18664bff68df7 SHA1 86026a460fe694287a9b782d6b6f8d1a2807bacb SHA256 fa825ff455b7c6fb53bd4090e7fb99038ce426b4078b4f1dda0307fc4fa216b3
 DIST skype_staticQT-1.3.0.53-generic.tar.bz2 15102554 RMD160 3ae225f3a14b0e50b0ed1370418fafef2c3f719e SHA1 7f0195ec48d8fbcb8aaf2282990341459f384f29 SHA256 338230bd3252180bd0079879823e9a0e5316e073295f93e83fcca88f1ac06833
@@ -37,14 +39,14 @@ EBUILD skype-1.3.0.53-r1.ebuild 3497 RMD160 ad50edbff0421bfd1144ae3eef65051ab9d1
 MD5 addb8442d0fa446604e6ea8d8814594f skype-1.3.0.53-r1.ebuild 3497
 RMD160 ad50edbff0421bfd1144ae3eef65051ab9d1e7ad skype-1.3.0.53-r1.ebuild 3497
 SHA256 c73a297ab35110f8d61fc6e52a27fa2ef425f7dd0e6d9e896717429d108d3def skype-1.3.0.53-r1.ebuild 3497
-EBUILD skype-1.4.0.58_alpha.ebuild 3618 RMD160 1ccff723a9a7e699b1898778dd1b2bed61671b77 SHA1 8d73b28ac268ff08f0272d886c5102888bc4e001 SHA256 99269f84ae030f8782fc893dc44207789da8a6c1a19c570a2411c5299ec33b29
-MD5 f8f07c746c803997c79c2a6ecb48d7e6 skype-1.4.0.58_alpha.ebuild 3618
-RMD160 1ccff723a9a7e699b1898778dd1b2bed61671b77 skype-1.4.0.58_alpha.ebuild 3618
-SHA256 99269f84ae030f8782fc893dc44207789da8a6c1a19c570a2411c5299ec33b29 skype-1.4.0.58_alpha.ebuild 3618
-MISC ChangeLog 13359 RMD160 f354accb026c6ef4eea847ab7254837382f12c11 SHA1 bbba3e49448e1eb07d8e17e02fc73a7c40a2d0ad SHA256 d3e9cec6ee9e410c0e54795ce7f0ae01e0cea642610b24da72440376fb5572e9
-MD5 859fc94f5cb48ca31c0aeab766c6e342 ChangeLog 13359
-RMD160 f354accb026c6ef4eea847ab7254837382f12c11 ChangeLog 13359
-SHA256 d3e9cec6ee9e410c0e54795ce7f0ae01e0cea642610b24da72440376fb5572e9 ChangeLog 13359
+EBUILD skype-1.4.0.64_alpha.ebuild 3988 RMD160 d4ad6a940e01ecf9a58fc0ae4cbb09cfeddc1a57 SHA1 349024fb0c46ade0d6ea1f5c5c785a7b1c10ffd7 SHA256 49bbce908cb086caae750482d982ea2fa352a4d8549ac7644e154ecf7f0d47fb
+MD5 9f59b67854b3ede7bb7b3d1789401fd2 skype-1.4.0.64_alpha.ebuild 3988
+RMD160 d4ad6a940e01ecf9a58fc0ae4cbb09cfeddc1a57 skype-1.4.0.64_alpha.ebuild 3988
+SHA256 49bbce908cb086caae750482d982ea2fa352a4d8549ac7644e154ecf7f0d47fb skype-1.4.0.64_alpha.ebuild 3988
+MISC ChangeLog 13624 RMD160 de834aab14bcf92006a1df35413ad93fee93aadb SHA1 6d2d94eedeba03d15d4d26be216bc601240eb736 SHA256 acce9bc2c272bff28e1d7413ecf204c5d0b1593b639e5b74e7e1d19c4e8e764d
+MD5 123df65d6734d8c6d0e2c7861cc2b5b8 ChangeLog 13624
+RMD160 de834aab14bcf92006a1df35413ad93fee93aadb ChangeLog 13624
+SHA256 acce9bc2c272bff28e1d7413ecf204c5d0b1593b639e5b74e7e1d19c4e8e764d ChangeLog 13624
 MISC metadata.xml 488 RMD160 0dc53516bb6b9f04aad7625aaf8e81f94f288117 SHA1 8e376a6a24f831850ee87a8538c5b3336f6986e2 SHA256 964cb103f057a79a194dea8ef8cd183400daa2d8f7041a57f95f3544b0b0a7a9
 MD5 dbaa6f09202bfea8c248e1f7c222d40f metadata.xml 488
 RMD160 0dc53516bb6b9f04aad7625aaf8e81f94f288117 metadata.xml 488
@@ -58,13 +60,6 @@ SHA256 4b42f1a7bddcb3e6e5983b00f4586a56e33980ae9ccd64d9f1f2970ba21aad2e files/di
 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
-MD5 2b4477de10a75912fc750c4ab486c1a3 files/digest-skype-1.4.0.58_alpha 617
-RMD160 72affb72c2f3a96c85dd602bd87ba1cd0df585ca files/digest-skype-1.4.0.58_alpha 617
-SHA256 7170d815dc244ce9010ebe3fb9d42f25f6b9cb222c6f28c4b2a720b1abfdf431 files/digest-skype-1.4.0.58_alpha 617
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGVAR/jJyKLBkBVroRAhyiAJ94ezGXmvbXOD+MnJHmFgYf8cTs/gCg1/up
-LtJI5FxRNP9QcZgqiYNL2Ks=
-=IYVu
------END PGP SIGNATURE-----
+MD5 1af6806aca593a274827add0acbd5ee6 files/digest-skype-1.4.0.64_alpha 924
+RMD160 5245ddcfbaec59610a6adb9749c71da4b4bd6281 files/digest-skype-1.4.0.64_alpha 924
+SHA256 c2ee0d7eb18ee2a4c51100edff82d786e255357c892461d5ddd659daa3b01d42 files/digest-skype-1.4.0.64_alpha 924
diff --git a/net-im/skype/files/99skype b/net-im/skype/files/99skype
new file mode 100644
index 000000000000..91bc0f4a4a2c
--- /dev/null
+++ b/net-im/skype/files/99skype
@@ -0,0 +1 @@
+LDPATH=/opt/skype
diff --git a/net-im/skype/files/digest-skype-1.4.0.58_alpha b/net-im/skype/files/digest-skype-1.4.0.58_alpha
deleted file mode 100644
index ca5cf79bf9be..000000000000
--- a/net-im/skype/files/digest-skype-1.4.0.58_alpha
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 da348697a934ba389c782cf2d089e431 skype-alpha-1.4.0.58-generic.tar.bz2 11273689
-RMD160 593012f065ee07a438749e93123a533add269e9f skype-alpha-1.4.0.58-generic.tar.bz2 11273689
-SHA256 f0da9f3f13b0cf71c8e574e95d0b5c1c408c83f46cef5ba8b5d162505bc7d2b8 skype-alpha-1.4.0.58-generic.tar.bz2 11273689
-MD5 a817381d657fc16e47e0ea9c6e823c5d skype-alpha_staticQT-1.4.0.58-generic.tar.bz2 17003818
-RMD160 5e89d1e36c2d3ca3986cf5239efcb47ec4c7b257 skype-alpha_staticQT-1.4.0.58-generic.tar.bz2 17003818
-SHA256 198bd939f0901ad95736d8bcb4e1203d34915d47d36c4a40acbc9fec19a8b159 skype-alpha_staticQT-1.4.0.58-generic.tar.bz2 17003818
diff --git a/net-im/skype/files/digest-skype-1.4.0.64_alpha b/net-im/skype/files/digest-skype-1.4.0.64_alpha
new file mode 100644
index 000000000000..d3320a966dba
--- /dev/null
+++ b/net-im/skype/files/digest-skype-1.4.0.64_alpha
@@ -0,0 +1,9 @@
+MD5 751c485f35585ab8039fb56d6f9d5146 libsigc++20-2.0.17-1-from-fc5.rf.i386.tar.gz 7845
+RMD160 e66d772cc6548fce1681febab7fbfa0846c9b910 libsigc++20-2.0.17-1-from-fc5.rf.i386.tar.gz 7845
+SHA256 066422155ddb13eb6882fcd8d253460edcf4ee3961706ff027be90136aee7d56 libsigc++20-2.0.17-1-from-fc5.rf.i386.tar.gz 7845
+MD5 ec99cee70b564ab4835bbcb683b2805a skype-alpha-1.4.0.64-generic.tar.bz2 11430696
+RMD160 21c44d631b4ff22093c90791d240545695a5d241 skype-alpha-1.4.0.64-generic.tar.bz2 11430696
+SHA256 619a4870e5a1dc45f07550c7c442ff9d5ecf00bab9379a0ae266c70a4283de5c skype-alpha-1.4.0.64-generic.tar.bz2 11430696
+MD5 b2e52f03040a0d5a35ced5a612e2a40b skype-alpha_staticQT-1.4.0.64-generic.tar.bz2 17589417
+RMD160 3f36dd06cd5db870762bc7f684cce57906b9820d skype-alpha_staticQT-1.4.0.64-generic.tar.bz2 17589417
+SHA256 42abc17e2baef1d7aba184569dd4ebe35049e84aff8ec6eba62442bc413d6bc7 skype-alpha_staticQT-1.4.0.64-generic.tar.bz2 17589417
diff --git a/net-im/skype/skype-1.4.0.58_alpha.ebuild b/net-im/skype/skype-1.4.0.64_alpha.ebuild
index 42c2a2875223..7cee826ec3ed 100644
--- a/net-im/skype/skype-1.4.0.58_alpha.ebuild
+++ b/net-im/skype/skype-1.4.0.64_alpha.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.4.0.58_alpha.ebuild,v 1.3 2007/05/23 09:07:55 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.4.0.64_alpha.ebuild,v 1.1 2007/05/23 14:32:56 humpback Exp $
 
 inherit eutils qt4
 
@@ -14,11 +14,12 @@ HOMEPAGE="http://www.skype.com/"
 SRC_URI="
 		!static? ( http://download.skype.com/linux/${MY_PN}-alpha-${MY_PV}-generic.tar.bz2 )
 		static? (
-		http://download.skype.com/linux/${MY_PN}-alpha_staticQT-${MY_PV}-generic.tar.bz2 )"
+		http://download.skype.com/linux/${MY_PN}-alpha_staticQT-${MY_PV}-generic.tar.bz2 )
+		amd64? ( http://felisberto.net/~humpback/libsigc++20-2.0.17-1-from-fc5.rf.i386.tar.gz )"
 
 LICENSE="skype-eula"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE="static"
 DEPEND="
 	amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.2
@@ -36,10 +37,10 @@ QA_EXECSTACK_x86="opt/skype/skype"
 QA_EXECSTACK_amd64="opt/skype/skype"
 
 pkg_setup() {
-#	if use amd64 && ! use static;
-#	then
-#		die "There is no pre-built qt4 for amd64. Please turn the static flag on"
-#	fi
+	if use amd64 && ! use static;
+	then
+		die "There is no pre-built qt4 for amd64. Please turn the static flag on"
+	fi
 
 	if ! use static && ! built_with_use ">=x11-libs/qt-4.0" accessibility;
 	then
@@ -55,6 +56,10 @@ src_unpack() {
 	else
 		unpack ${MY_PN}-alpha-${MY_PV}-generic.tar.bz2
 	fi
+	if use amd64;
+	then
+		unpack libsigc++20-2.0.17-1-from-fc5.rf.i386.tar.gz
+	fi
 }
 
 src_install() {
@@ -115,6 +120,17 @@ src_install() {
 
 	make_desktop_entry skype "Skype VoIP" skype
 
+	#AMD64 team does not provide this so we add it:
+	if use amd64;
+	then
+		cd ${WORKDIR}
+		exeinto /opt/${PN}
+		doexe libsigc-2.0.so.0
+		doexe libsigc-2.0.so.0.0.0
+		doenvd "${FILESDIR}"/99skype
+	fi
+
+
 	# TODO: Optional configuration of callto:// in KDE, Mozilla and friends
 }