Workaround problems to connect to servers, bug #389955

Package-Manager: portage-2.1.10.38/cvs/Linux x86_64

4 files changed, 261 insertions, 17 deletions

diff --git a/net-im/emesene/ChangeLog b/net-im/emesene/ChangeLog
index 5ce5afc95f33..73fc4343c9b8 100644
--- a/net-im/emesene/ChangeLog
+++ b/net-im/emesene/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/emesene
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/ChangeLog,v 1.14 2011/11/13 20:41:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/ChangeLog,v 1.15 2011/11/28 20:31:54 pacho Exp $
+
+*emesene-1.6.3-r1 (28 Nov 2011)
+
+  28 Nov 2011; Pacho Ramos <pacho@gentoo.org> +emesene-1.6.3-r1.ebuild,
+  +files/emesene-1.6.3-update-servers.patch:
+  Workaround problems to connect to servers, bug #389955
 
 *emesene-2.11.11 (13 Nov 2011)
 
diff --git a/net-im/emesene/Manifest b/net-im/emesene/Manifest
index 4a20f6ce8953..641d60f65839 100644
--- a/net-im/emesene/Manifest
+++ b/net-im/emesene/Manifest
@@ -1,29 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX emesene-1.6.3-update-servers.patch 10778 RMD160 8f54eecf3e7bfcde1c8d5551a653051db0cb0a82 SHA1 2f0d7ac40a648ac4e84701814649f0feeb63c4fa SHA256 9976008ab04f49136a001899b9aeafaf77d5f176f8d8451ac8e9c5589f1616e5
 DIST emesene-1.6.3.tar.gz 3078128 RMD160 9037824c713401b33cd7f172ba38f659c7de5f67 SHA1 c4759efe180c8e1589bd966c6b84106aa7cd356e SHA256 9b088a17b4d9d3a2be72737a02dceb7a1a224b978a30b6490fa3354fb49b4bfa
 DIST emesene-2.11.11.tar.gz 10466296 RMD160 29f7db8fd8db9aca2ddeb498c0c23f6f6faf8a57 SHA1 1dea80c02a5109c5c136f58c1c24e1f11268a1ff SHA256 2b5612a0d351eb3e00efeb37f9403e2f7eeed74edbbbbd1df62aaacb566caa4b
 DIST emesene-2.11.9.tar.gz 10425646 RMD160 64b7d80a1ce710d52ef372a91eb0c64071ffe9b2 SHA1 77a79988b7f08b973e1be309095934ed4698cb6a SHA256 8136011c319d41ac51980ec5b88afb1540fa7c8ae9048adb4119df457113cf02
+EBUILD emesene-1.6.3-r1.ebuild 1831 RMD160 72851396d5968fd7808c468153d3d706ddd875ec SHA1 fdb55491eb1809290949bc803b02a37a5ab32c14 SHA256 cd77b55111a45687081cc19b04eb62a3817a03ac2a4e3669434fd2d36e9734e1
 EBUILD emesene-1.6.3.ebuild 1723 RMD160 0b3f87851545d2ef3aeaeae97af2790b711ddd57 SHA1 3bf31eecd099a056fbda90495f3eec571a0cd977 SHA256 8d8e75d3973aca97583db3560276050925bfd250f6e1a423f33f81cbd62f6600
 EBUILD emesene-2.11.11.ebuild 1622 RMD160 58fcf6a21908332eed534a91185d8bc6886baa34 SHA1 ffddfdb5b74d75c009324424a81057a131722ee3 SHA256 cf7a5c8c6c3f852899e8b5387b2c272e0a50b1a4572705017985a74626f58c67
 EBUILD emesene-2.11.9.ebuild 1621 RMD160 b154383f7f53d2bfe9db0e82f4a06afd75eb3baf SHA1 0ead36b6f33dbe05cc3086241ee67de0b14a4dcb SHA256 79554f6055438d18c7fb18e13d08d979cf805987f18c7c27aeaa9f556f484481
 EBUILD emesene-9999.ebuild 1921 RMD160 f223107f5a7033ec5d2cf05f3bfd12ee25c714d9 SHA1 a5819a701deb1e85f2521ea6a84cb68fb55cc62f SHA256 e7928a86f7cda26e6ad02da4e6d002d98a66f782a2d8a7c6c8d9e68886beb2a8
-MISC ChangeLog 2474 RMD160 b33597b917cd50d02eeca560653bf9d67ad2ead9 SHA1 625c1d44c072a292ecfc3ab17b1eac8ae56457e7 SHA256 b92fcf702862b4a39e1ba56b50d174d82aacda6effdbdb5bcd75f0d81ef6de36
+MISC ChangeLog 2679 RMD160 1540891a973e7b0bcadab797cfb7d32bf8957dc8 SHA1 fa0f8f3720fb1f93b167e5220640eadffc02dc75 SHA256 0bd0a34531ad6fbec48c8dd42e5fafa9b9a0b04a33e6e665e30481d9d5de6c15
 MISC metadata.xml 345 RMD160 d6e01a75f8401a5411ae4fa9c1e1e45b752dd780 SHA1 cebcaec97d9e643738acc5e6b2f530d8149a5707 SHA256 ad56753dd33a102516841479a4bb0f36d982bd56b4ce7129064588e266b2f3eb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOwDk5AAoJEPqDWhW0r/LCj/kQAJR6JIKJIFIxIZpJQMdHp2V1
-NFKDDjzrBKvSYHTckcaqfwx+XQAMnOX1GS1or/DufVTmR02sqvPsesFu+Nk4zDmL
-6SzZWkfkBOo+C16FwktooTDum4+Tx9QJ1DM58D2oCBEb/iIX3yvo05Cs0nfwET5j
-oUTPm3QgWTkfuTqisN5XEQFEkhut7FdLW1sr8Y9NKZcxgeiGtjbsSH83gnnPXH29
-Sn5fjKy/CSElaPWBviFYu1rguA+u8N76eItMSr657GTIFY8TW/+qLS7RfC0CFEM2
-Yoz+0ayjfbittGj8hyWSK1bBfRq3xWrsyt7jsoC9TIgx3VtqYsG5whxiFgdUCFnr
-7NYFxzOC6yMLlMbx10JNOMFsQfHf35SI2sC4JGkBePUofdkn49XCUC67Lo/g7cgU
-9UH+zK2eqUfmQuGTTIiCaZLaSmvabeWBnSb7o+vSAkc496xLWZnzWznVbxwxCT7Q
-tk9Coiq0Q1BPuyrr2Jaggo4A0vjinqyjWiyPaaTzzF8Oyfmi6Awq0hAtz0vejcsM
-4/riY+bCu8jB/9EfxlSMNx0YyMekkrnc6x7oIfrJrD9xiPr41QU+qydyGUdLYWu4
-sV5k6diTMpSYOGdlge+QHM68DTZKkwwOqeIVpP3RflLFU4tMokUJk1BT2IZaoQrn
-Yk5kTg9MyKoibgG0TqtI
-=FCCy
+iEYEARECAAYFAk7T78AACgkQCaWpQKGI+9QYfQCfZkXqsyb6UJbs1S15YtkgyRGS
+FBsAnRLgmKC0f4Ll/oph4Pa3GXbiA8D+
+=RIz9
 -----END PGP SIGNATURE-----
diff --git a/net-im/emesene/emesene-1.6.3-r1.ebuild b/net-im/emesene/emesene-1.6.3-r1.ebuild
new file mode 100644
index 000000000000..632c70f66e07
--- /dev/null
+++ b/net-im/emesene/emesene-1.6.3-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/emesene-1.6.3-r1.ebuild,v 1.1 2011/11/28 20:31:54 pacho Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+
+inherit python eutils
+
+DESCRIPTION="Platform independent MSN Messenger client written in Python+GTK"
+HOMEPAGE="http://www.emesene.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="webcam"
+
+RDEPEND="dev-python/pygtk:2
+	webcam? ( media-plugins/gst-plugins-meta[v4l]
+		dev-python/gst-python
+		media-libs/libmimic )"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	# Workaround problems to connect to servers, bug #389955
+	epatch "${FILESDIR}/${P}-update-servers.patch"
+
+	rm GPL PSF LGPL || die "rm license files failed"
+
+	if ! use webcam; then
+		rm -r libmimic || die "rm libmimic dir failed"
+	fi
+
+	python_convert_shebangs -r 2 .
+}
+
+src_compile() {
+	if use webcam ; then
+		$(PYTHON) ./setup.py build_ext -i || die "libmimic compile failed"
+	fi
+}
+
+src_install() {
+	if use webcam; then
+		rm -r build || die "rm build failed"
+	fi
+
+	insinto /usr/share/${PN}
+	doins -r * || die "doins failed"
+
+	fperms a+x /usr/share/${PN}/${PN} || die "fperms failed"
+	dosym /usr/share/${PN}/${PN} /usr/bin/${PN} || die "dosym failed"
+
+	doman misc/${PN}.1 || die "doman failed"
+
+	doicon misc/*.{svg,png} || die "doicon failed"
+
+	# install the desktop entry
+	domenu misc/${PN}.desktop || die "domenu failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/share/${PN}
+
+	elog "If you want to use the spell-checking feature, you should emerge"
+	elog "dev-python/gtkspell-python"
+	elog
+	elog "If you want to use EncryptMessage plugin, you should emerge"
+	elog "dev-python/pexpect"
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/${PN}
+}
diff --git a/net-im/emesene/files/emesene-1.6.3-update-servers.patch b/net-im/emesene/files/emesene-1.6.3-update-servers.patch
new file mode 100644
index 000000000000..cfc00036b7ed
--- /dev/null
+++ b/net-im/emesene/files/emesene-1.6.3-update-servers.patch
@@ -0,0 +1,168 @@
+diff -ur emesene-1.6.3.old//emesenelib/ProfileManager.py emesene-1.6.3/emesenelib/ProfileManager.py
+--- emesene-1.6.3.old//emesenelib/ProfileManager.py	2010-07-13 00:13:14.000000000 +0200
++++ emesene-1.6.3/emesenelib/ProfileManager.py	2011-11-28 21:27:10.542693399 +0100
+@@ -658,7 +658,7 @@
+ 
+         soap.manager.do_request(self.proxy,\
+             'http://www.msn.com/webservices/AddressBook/ABGroupAdd',
+-            'contacts.msn.com', 443, '/abservice/abservice.asmx',
++            'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx',
+             soap.templates.addGroup % (group,),
+             self.onGroupAdded, (group,))
+ 
+@@ -690,7 +690,7 @@
+ 
+             soap.manager.do_request(self.proxy,\
+                 'http://www.msn.com/webservices/AddressBook/ABGroupDelete', \
+-                'contacts.msn.com', 443, '/abservice/abservice.asmx', \
++                'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx', \
+                 soap.templates.deleteGroup % (gid,), \
+                 self.onGroupRemoved, (gid, groupObj))
+ 
+@@ -732,7 +732,7 @@
+             self.emit('group-attr-changed', objOldGroup, group)
+             soap.manager.do_request(self.proxy,\
+                 'http://www.msn.com/webservices/AddressBook/ABGroupUpdate', \
+-                'contacts.msn.com', 443, '/abservice/abservice.asmx', \
++                'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx', \
+                 soap.templates.renameGroup % (gid, common.escape(newGroup)), \
+                 self.onGroupRenamed, (oldGroup, newGroup))
+ 
+diff -ur emesene-1.6.3.old//emesenelib/soap/requests.py emesene-1.6.3/emesenelib/soap/requests.py
+--- emesene-1.6.3.old//emesenelib/soap/requests.py	2010-07-13 00:13:14.000000000 +0200
++++ emesene-1.6.3/emesenelib/soap/requests.py	2011-11-28 21:27:10.542693399 +0100
+@@ -22,59 +22,59 @@
+     common.debug("soap.requests: membership list", "soap")
+     soap.manager.do_request(proxy,
+         'http://www.msn.com/webservices/AddressBook/FindMembership',
+-        'contacts.msn.com', 443, '/abservice/SharingService.asmx',
++        'local-bay.contacts.msn.com', 443, '/abservice/SharingService.asmx',
+         soap.templates.membershipList, callback)
+ 
+ def address_book(proxy, callback):
+     common.debug("soap.requests: address book", "soap")
+     soap.manager.do_request(proxy,
+         'http://www.msn.com/webservices/AddressBook/ABFindAll',
+-        'contacts.msn.com', 443, '/abservice/abservice.asmx',
++        'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx',
+         soap.templates.addressBook, callback)
+ 
+ def change_alias(proxy, contactID, alias, callback, *args):
+     alias = str(common.escape(alias))
+     soap.manager.do_request(proxy,
+         'http://www.msn.com/webservices/AddressBook/ABContactUpdate',
+-        'contacts.msn.com', 443, '/abservice/abservice.asmx',
++        'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx',
+         soap.templates.renameContact % (str(contactID), alias),
+         callback, args)
+ 
+ def add_contact(proxy, email, callback, *args):
+     soap.manager.do_request(proxy,
+         'http://www.msn.com/webservices/AddressBook/ABContactAdd',
+-        'contacts.msn.com', 443, '/abservice/abservice.asmx',
++        'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx',
+         soap.templates.contactAdd % (email, ), callback, args)
+ 
+ def remove_contact(proxy, contactID, callback, *args):
+     soap.manager.do_request(proxy,
+         'http://www.msn.com/webservices/AddressBook/ABContactDelete',
+-        'contacts.msn.com', 443, '/abservice/abservice.asmx',
++        'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx',
+         soap.templates.contactRemove % (contactID, ), callback, args)
+ 
+ def add_to_group(proxy, gid, contactID, callback, *args):
+     soap.manager.do_request(proxy,
+         'http://www.msn.com/webservices/AddressBook/ABGroupContactAdd',
+-        'contacts.msn.com', 443, '/abservice/abservice.asmx',
++        'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx',
+         soap.templates.moveUserToGroup % (gid, contactID), callback, args)
+ 
+ def remove_from_group(proxy, contactID, sourceGid, callback, *args):
+     soap.manager.do_request(proxy,
+         'http://www.msn.com/webservices/AddressBook/ABGroupContactDelete',
+-        'contacts.msn.com', 443, '/abservice/abservice.asmx',
++        'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx',
+         soap.templates.deleteUserFromGroup % (contactID, sourceGid),
+         callback, args)
+ 
+ def add_role(proxy, role, email, callback, *args):
+     soap.manager.do_request(proxy,
+         'http://www.msn.com/webservices/AddressBook/AddMember',
+-        'contacts.msn.com', 443, '/abservice/SharingService.asmx',
++        'local-bay.contacts.msn.com', 443, '/abservice/SharingService.asmx',
+         soap.templates.addMember % (role, email), callback, args)
+ 
+ def delete_role(proxy, role, email, callback, *args):
+     soap.manager.do_request(proxy,
+         'http://www.msn.com/webservices/AddressBook/DeleteMember',
+-        'contacts.msn.com', 443, '/abservice/SharingService.asmx',
++        'local-bay.contacts.msn.com', 443, '/abservice/SharingService.asmx',
+         soap.templates.deleteMember % (role, email), callback, args)
+ 
+ def get_profile(proxy, cid, callback):
+diff -ur emesene-1.6.3.old//emesenelib/soap/templates.py emesene-1.6.3/emesenelib/soap/templates.py
+--- emesene-1.6.3.old//emesenelib/soap/templates.py	2010-07-13 00:13:14.000000000 +0200
++++ emesene-1.6.3/emesenelib/soap/templates.py	2011-11-28 21:27:10.545693399 +0100
+@@ -68,7 +68,7 @@
+             <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
+             <wsp:AppliesTo>
+                 <wsa:EndpointReference>
+-                    <wsa:Address>contacts.msn.com</wsa:Address>
++                    <wsa:Address>local-bay.contacts.msn.com</wsa:Address>
+                 </wsa:EndpointReference>
+             </wsp:AppliesTo>
+             <wsse:PolicyReference URI="MBI"></wsse:PolicyReference>
+@@ -147,7 +147,7 @@
+ # the secont parameter should specify the member by contactId
+ # POST /abservice/abservice.asmx HTTP/1.1
+ # SOAPAction: http://www.msn.com/webservices/AddressBook/ABGroupContactAdd
+-# Host: omega.contacts.msn.com
++# Host: omega.local-bay.contacts.msn.com
+ 
+ oldaddUserToGroup =  '''<?xml version="1.0" encoding="utf-8"?>
+ <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+@@ -217,7 +217,7 @@
+ # the first %s is Allow or Block, the second is the passport mail
+ # POST /abservice/SharingService.asmx HTTP/1.1
+ # SOAPAction: http://www.msn.com/webservices/AddressBook/AddMember
+-# Host: omega.contacts.msn.com
++# Host: omega.local-bay.contacts.msn.com
+ addMember='''<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+ <soap:Header><ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook"><ApplicationId>CFE80F9D-180F-4399-82AB-413F33A1FA11</ApplicationId><IsMigration>false</IsMigration><PartnerScenario></PartnerScenario></ABApplicationHeader>
+ <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook"><ManagedGroupRequest>false</ManagedGroupRequest><TicketToken>&tickettoken;</TicketToken></ABAuthHeader></soap:Header>
+@@ -236,7 +236,7 @@
+ # the first %s is Allow or Block, the second is the passport mail
+ # POST /abservice/SharingService.asmx HTTP/1.1
+ # SOAPAction: http://www.msn.com/webservices/AddressBook/DeleteMember
+-# Host: omega.contacts.msn.com
++# Host: omega.local-bay.contacts.msn.com
+ deleteMember='''<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+ <soap:Header><ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook"><ApplicationId>CFE80F9D-180F-4399-82AB-413F33A1FA11</ApplicationId><IsMigration>false</IsMigration><PartnerScenario></PartnerScenario></ABApplicationHeader>
+ <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook"><ManagedGroupRequest>false</ManagedGroupRequest><TicketToken>&tickettoken;</TicketToken></ABAuthHeader></soap:Header>
+@@ -245,7 +245,7 @@
+ # %s is the group name
+ # POST /abservice/abservice.asmx HTTP/1.1
+ # SOAPAction: http://www.msn.com/webservices/AddressBook/ABGroupAdd
+-# Host: by6.omega.contacts.msn.com
++# Host: by6.omega.local-bay.contacts.msn.com
+ 
+ addGroup='''<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+ <soap:Header><ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook"><ApplicationId>CFE80F9D-180F-4399-82AB-413F33A1FA11</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>Timer</PartnerScenario></ABApplicationHeader>
+@@ -256,7 +256,7 @@
+ # the %s is the gid
+ # POST /abservice/abservice.asmx HTTP/1.1
+ # SOAPAction: http://www.msn.com/webservices/AddressBook/ABGroupDelete
+-# Host: by6.omega.contacts.msn.com
++# Host: by6.omega.local-bay.contacts.msn.com
+ 
+ deleteGroup='''<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+ <soap:Header><ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook"><ApplicationId>CFE80F9D-180F-4399-82AB-413F33A1FA11</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>Timer</PartnerScenario></ABApplicationHeader>
+@@ -266,7 +266,7 @@
+ # gid, name
+ # POST abservice/abservice.asmx HTTP/1.1
+ # SOAPAction: http://www.msn.com/webservices/AddressBook/ABGroupUpdate
+-# Host: omega.contacts.msn.com/
++# Host: omega.local-bay.contacts.msn.com/
+ 
+ renameGroup='''<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+ <soap:Header><ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook"><ApplicationId>CFE80F9D-180F-4399-82AB-413F33A1FA11</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>Timer</PartnerScenario></ABApplicationHeader>