Add a ugly hack wrt bug #179568.

Tested under ~amd64 and ~x86.

Package-Manager: portage-2.1.2.7

4 files changed, 27 insertions, 29 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index ec25314fa4ee..ad4dfdd0e6c6 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,11 @@
 # 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.71 2007/05/23 17:02:52 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.72 2007/05/24 09:51:21 drizzt Exp $
+
+  24 May 2007; Timothy Redaelli <drizzt@gentoo.org> -files/99skype,
+  skype-1.4.0.64_alpha.ebuild:
+  Add a ugly hack wrt bug #179568.
+  Tested under ~amd64 and ~x86.
 
   23 May 2007; Timothy Redaelli <drizzt@gentoo.org>
   skype-1.4.0.64_alpha.ebuild:
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index 1fe412cdfe42..13ef34e03621 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -1,10 +1,6 @@
 -----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
@@ -42,14 +38,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.64_alpha.ebuild 4022 RMD160 7e30b4a04b568b0b328ad80ef167905cf2bafbf6 SHA1 7372d0f4f23d6aa428373961538d9721d2f54cc1 SHA256 3c29401c52c3548abc6ccfee6e309b2d7e570e19ff1f784101e9b6105659474d
-MD5 a388354792c43e6748a8a17a10d18770 skype-1.4.0.64_alpha.ebuild 4022
-RMD160 7e30b4a04b568b0b328ad80ef167905cf2bafbf6 skype-1.4.0.64_alpha.ebuild 4022
-SHA256 3c29401c52c3548abc6ccfee6e309b2d7e570e19ff1f784101e9b6105659474d skype-1.4.0.64_alpha.ebuild 4022
-MISC ChangeLog 13734 RMD160 ff348c7d0875b19bc1831551f8909757694caae9 SHA1 90d165e96b3a4fce48713362d3a7e813ddccec7f SHA256 81b5e85678492556e0236c30552eb19dabd467d57f71a82ca25daeeea826328c
-MD5 fab64cd154ad9fd06b2e9fcf59adfe77 ChangeLog 13734
-RMD160 ff348c7d0875b19bc1831551f8909757694caae9 ChangeLog 13734
-SHA256 81b5e85678492556e0236c30552eb19dabd467d57f71a82ca25daeeea826328c ChangeLog 13734
+EBUILD skype-1.4.0.64_alpha.ebuild 4149 RMD160 6aedb26e8c4c11211144f5618a395127fc9b5d7f SHA1 3b3e7ac14484b7c59666fce41e282ca52fb793cf SHA256 8de1c48372c8c2b0dcf6b1503ccfc2e9a2e94cee6f98a04ed3dd2b8f2bb45f49
+MD5 0eaceb83365a1cb681f55804d48fc475 skype-1.4.0.64_alpha.ebuild 4149
+RMD160 6aedb26e8c4c11211144f5618a395127fc9b5d7f skype-1.4.0.64_alpha.ebuild 4149
+SHA256 8de1c48372c8c2b0dcf6b1503ccfc2e9a2e94cee6f98a04ed3dd2b8f2bb45f49 skype-1.4.0.64_alpha.ebuild 4149
+MISC ChangeLog 13901 RMD160 777df29e6ad0aabb8b794ace2ff5ec791f922950 SHA1 93159e9fbc88ef652dfed0c43648974ed85489f2 SHA256 0137fb4c4648328875b8c6968fb6a955d99c07bf2de718439088d728e38a6305
+MD5 569662c9ab83321257a8a9166853d22c ChangeLog 13901
+RMD160 777df29e6ad0aabb8b794ace2ff5ec791f922950 ChangeLog 13901
+SHA256 0137fb4c4648328875b8c6968fb6a955d99c07bf2de718439088d728e38a6305 ChangeLog 13901
 MISC metadata.xml 488 RMD160 0dc53516bb6b9f04aad7625aaf8e81f94f288117 SHA1 8e376a6a24f831850ee87a8538c5b3336f6986e2 SHA256 964cb103f057a79a194dea8ef8cd183400daa2d8f7041a57f95f3544b0b0a7a9
 MD5 dbaa6f09202bfea8c248e1f7c222d40f metadata.xml 488
 RMD160 0dc53516bb6b9f04aad7625aaf8e81f94f288117 metadata.xml 488
@@ -69,7 +65,7 @@ SHA256 c2ee0d7eb18ee2a4c51100edff82d786e255357c892461d5ddd659daa3b01d42 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGVHPGjJyKLBkBVroRAmsLAKC4+K9d3nZ7WpuKLazFCDH/YRkW5ACfQsO4
-vwUBiWPfqOHN+EKV9UioL68=
-=WMw7
+iD8DBQFGVWAjjJyKLBkBVroRAsw+AKCdNOS3QLVFgRaxjrJNEoa7MKXs4gCdFVWz
+Dr4lD+ZIMEa6vbnWIKSa/p4=
+=KQNf
 -----END PGP SIGNATURE-----
diff --git a/net-im/skype/files/99skype b/net-im/skype/files/99skype
deleted file mode 100644
index 91bc0f4a4a2c..000000000000
--- a/net-im/skype/files/99skype
+++ /dev/null
@@ -1 +0,0 @@
-LDPATH=/opt/skype
diff --git a/net-im/skype/skype-1.4.0.64_alpha.ebuild b/net-im/skype/skype-1.4.0.64_alpha.ebuild
index 80c0dfc90271..cf4baa7e2052 100644
--- a/net-im/skype/skype-1.4.0.64_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.64_alpha.ebuild,v 1.2 2007/05/23 17:02:52 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.4.0.64_alpha.ebuild,v 1.3 2007/05/24 09:51:21 drizzt Exp $
 
 inherit eutils qt4
 
@@ -30,8 +30,8 @@ DEPEND="
 		>=media-libs/alsa-lib-1.0.11
 		>=dev-libs/libsigc++-2
 		!static? ( $(qt4_min_version 4.2.3) ) )"
-#RDEPEND="${DEPEND}
-#	>=sys-apps/dbus-0.23.4"
+RDEPEND="${DEPEND}
+	>=sys-apps/dbus-1.0.0"
 
 QA_EXECSTACK_x86="opt/skype/skype"
 QA_EXECSTACK_amd64="opt/skype/skype"
@@ -76,8 +76,7 @@ src_install() {
 	exeopts -m0755
 	exeinto /opt/${PN}
 	doexe skype
-	doexe ${FILESDIR}/skype.sh
-	dosym /opt/skype/skype.sh /usr/bin/skype
+	make_wrapper skype /opt/${PN}/skype /opt/${PN} /opt/${PN} /usr/bin
 
 	#doexe skype-callto-handler
 	insinto /opt/${PN}/sounds
@@ -119,19 +118,18 @@ src_install() {
 	# Install the Documentation
 	#dodoc README LICENSE
 
-
 	make_desktop_entry skype "Skype VoIP" skype
 
 	#AMD64 team does not provide this so we add it:
-	if use amd64;
-	then
-		cd ${WORKDIR}
+	if use amd64; then
 		exeinto /opt/${PN}
-		doexe libsigc-2.0.so.0
-		doexe libsigc-2.0.so.0.0.0
-		doenvd "${FILESDIR}"/99skype
+		dosym libsigc-2.0.so.0.0.0 /opt/${PN}/libsigc-2.0.so.0
+		doexe "${WORKDIR}"/libsigc-2.0.so.0.0.0
 	fi
 
+	#Ugly hack for bug #179568
+	use amd64 && multilib_toolchain_setup x86
+	dosym /usr/$(get_libdir)/libdbus-1.so /opt/${PN}/libdbus-1.so.2
 
 	# TODO: Optional configuration of callto:// in KDE, Mozilla and friends
 }