Apply patch from http://kmess.org/board/viewtopic.php?f=4&t=20549 to fix recent contact list problem

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

4 files changed, 125 insertions, 15 deletions

diff --git a/net-im/kmess/ChangeLog b/net-im/kmess/ChangeLog
index 5796456eae96..d4598fcf22ca 100644
--- a/net-im/kmess/ChangeLog
+++ b/net-im/kmess/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/kmess
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/ChangeLog,v 1.82 2011/10/28 23:24:03 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/ChangeLog,v 1.83 2011/11/06 10:33:05 hwoarang Exp $
+
+*kmess-2.0.6-r2 (06 Nov 2011)
+
+  06 Nov 2011; Markos Chandras <hwoarang@gentoo.org> +kmess-2.0.6-r2.ebuild,
+  +files/kmess-2.0.6-contact-list.patch:
+  Apply patch from http://kmess.org/board/viewtopic.php?f=4&t=20549 to fix
+  recent contact list problem
 
   28 Oct 2011; Jonathan Callen <abcd@gentoo.org> kmess-2.0.9999.ebuild,
   kmess-9999.ebuild:
diff --git a/net-im/kmess/Manifest b/net-im/kmess/Manifest
index 8d2b68d6c31f..0bfa7759dbad 100644
--- a/net-im/kmess/Manifest
+++ b/net-im/kmess/Manifest
@@ -2,27 +2,29 @@
 Hash: SHA512
 
 AUX 2.0.5-msn_login_url_fix.patch 1637 RMD160 c9de7aa9ed2776b122371570a0132942ab817f84 SHA1 cba7a7506f7390959f712106df5b00d824242f91 SHA256 146883b9430532ed3d5766a26aab45cbb311600591516a104f179f11fe9087ad
+AUX kmess-2.0.6-contact-list.patch 1659 RMD160 6b7b2ef695017de925019c48b71ac3edd10cfdfd SHA1 0380a14ab7b08665961f715ee57714d75469c546 SHA256 95a9bf74ad625ae3047664cb6e71fc96c9c1ab9c797b6604c13dbe735506937b
 AUX kmess-2.0.6-login-fix.patch 645 RMD160 5f6c9e8c6a3f232104d71241b966e33492d39025 SHA1 704e65136bdfd9a0dac6d82f50acd19824f2a0ad SHA256 a8024cffc91c4f5ddb91faebf33b2b5d5f7cd0a992afaccb288fbdb95864a7e0
 DIST kmess-2.0.6.tar.bz2 3183344 RMD160 e9eedc9b92d442e9d556487c45c796a910b50bbd SHA1 b2032648c810c7e2e986bbfc104443f1b38437f0 SHA256 3d2a93f71c6cd1e7969dee34fe0f78427cc5c512853f0bd2437c65baa92224f2
 EBUILD kmess-2.0.6-r1.ebuild 1502 RMD160 9930b20d2110f1a6dae9561972e8c426857a9684 SHA1 c0e0d5885bb36caf6e5cd64be4ba8ba66d5bd641 SHA256 0f2ab1fa745d926eb68cfa53fb1db5f002b1254b891e2e2c96678661b2e16102
+EBUILD kmess-2.0.6-r2.ebuild 1545 RMD160 fa6525cc7144d690aa93769c18848daa5f74bf20 SHA1 a23db6b156c7decd90e36df63e8c3ce6f99d2374 SHA256 0f31662b10f7b182b71f6d76d9e130e5c3ec1afd8fad98c5ed9f93504daa2ccf
 EBUILD kmess-2.0.9999.ebuild 1491 RMD160 8d1e73663f0cef1452a0ad55963bd2abd8315659 SHA1 5bf656579d1310025f5dbb1f8bd894f5c2b61230 SHA256 767bd4e9c4c62f457dfa09be8569308c11b25fe9a2538d48ac4912277429317a
 EBUILD kmess-9999.ebuild 1461 RMD160 1ee1b3e3d8c5601391607b2ffe634bb37ad75298 SHA1 44c226c2935674471135a88cc461a4ac0c1fa06e SHA256 6a512258f906085200ed8c1682895cf8c7f4c558569e0c3a89f7c2d01c9f62a0
-MISC ChangeLog 12146 RMD160 1a9bb17463307090034a6655e15f7738dc2c3507 SHA1 a9a0009d74e97319a0b061bce0662e2b34b8c52e SHA256 3421228af3f97924f2c91bef57ec4552277bee09b5c4c70530d584644b451084
+MISC ChangeLog 12405 RMD160 1ce23900354792840dc45d08d5ea09cf8535a257 SHA1 a4f2e7592a6fe712673ccf0e8200b3a33253dfbe SHA256 81d4312318d8c7ebe257a973f0e1f3b079e79c6f7fbd1c25a28a4a0b1af4a1f1
 MISC metadata.xml 412 RMD160 24c240202b46a8feddfda4f98de84360ef3f42ec SHA1 7400ce3e9f72c85fcadac8fa67b1e77d988ad2f7 SHA256 a8709df1103848b82fc1e16588d03e687e44e5627d53f07564f873e7b5e4b570
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOqzmfAAoJELHSF2kinlg4XDAQAI6F9AIq3MENZ8eDZSr6qugd
-4AOvUIYSd60i3pHRVsNp/LzpzcZkrBiGM4YoQCZQZqX+jmC2jw3PMtyVPpTLNxbH
-nhz6jI5XcZHDSEThw4poC7QOhvSs3IMMGwmACfgpewoT1HI3X4S9FrNZpa9hisJu
-QmuyLNWH0HB8uqaRlWyjBzBCZXzzE58in+W+YqRTOF9tR/c+J8E/g1Kl6EcqttU4
-fl7qEW4LQWVjiDITzAiUonQiVBxZqkUGb70KaOqPzr7QrpiJtTLpn3UfxJ9GhXdr
-Qob9XhLnfk8W6iyEuhHLdQRiU5VM7GsYMsWhMGpnFUwVBn8AWfxMfcNj4MklV6jr
-swTt5Nv/ARincIFEYZnT/Zn/J3OFiF6Bcv71/CEFJ5DgrQtlmAgPabvpjjJQrNko
-XSZKJ9Zz0lN/V1GeXr6DTri3iNjGvqsJdboZ1BJVnKWAYvREBqsBdwuPK7Wz3+bH
-R805fSSzXC+RwiLm6VZofl8R8Fo26oICN5kbZEqtepzlF7cax3wxdhxIxBJkNlsw
-aAoXWZdFtE0bjStnjnTmCcdjz7cEunTJuFte5Lz7NoxDDdHEj+vZy+mZoWUMtc1X
-JugrTw+aFagpzURrrkToCah4CEA2SiopaDgmf1V5Zb2Jrpw5eGUAzWhAWpcjZf+8
-Ws0EUi5mt2avFiiQ7vTc
-=ebgg
+iQIcBAEBCgAGBQJOtmJnAAoJEPqDWhW0r/LCXVIP/2glKW0BqQeVtqcse2g7nqav
+BE2QHe+5iqWfu8kOBbVGDbov7uyg+RxCTtVkSUKVD0odExacGgyjMMXhSU3uwWqJ
+ck4sn/wHA8e196vlsah3cSa55AWlNkfYwlPztEWlNgagRRnj7ZiM1YgkSBwUgQzw
+FP/j1In3BOHigNxsgEPajrxK6xmiguxZWLyVYK7isXPF0pIPi02yAkHigEQ5U2L7
+TzpspX32eUrCjS3lTXJHjqUD1CcQbvJ/Sjna/mKTVTgnXLi+gWHUggjBfU4hwatM
+MEkXgfDCXCzxGLTm9eZC2FBdi/cKRxWCxAK6FONjC/5AsXWnNhDuvKnBKa1vLEPU
+cUBkuwb+y6Ud5fuITLyAN19R6SyXLr1i0K82VOhpm6VC2JUXjq/K/+xLPoBOkTuU
+WPidZRVweJD0bJ8KrofrxGpOVuJHcPwkK3xzDLTuqn7194pfJXRCLseDNmXRPuva
+aDDTP1ceyjFXr6sttUpdlomoXWVOLMAzfVe56qzOw6MY+cxrY22Oqy6aBqjEfoJQ
+0VQ/vrGL1vlL2y47RNm+qb3abLXlKLfyeEpSoDeMvM9A+RLoYOiGzLikptXA6Hwr
+g1G8KbiIG22J/X4ZLzrHulK18tHooqS+Rxqb66dkS2PhaHFU9P4ijv7pjdDZdt2z
+Vz7RWxL1B6uVVmLD8hPU
+=BwL1
 -----END PGP SIGNATURE-----
diff --git a/net-im/kmess/files/kmess-2.0.6-contact-list.patch b/net-im/kmess/files/kmess-2.0.6-contact-list.patch
new file mode 100644
index 000000000000..59f8c4099fb4
--- /dev/null
+++ b/net-im/kmess/files/kmess-2.0.6-contact-list.patch
@@ -0,0 +1,38 @@
+Index: kmess-2.0.6/src/network/soap/addressbookservice.cpp
+===================================================================
+--- kmess-2.0.6.orig/src/network/soap/addressbookservice.cpp
++++ kmess-2.0.6/src/network/soap/addressbookservice.cpp
+@@ -35,13 +35,12 @@
+ /**
+  * @brief URL of the Address Book Service
+  */
+-#define SERVICE_URL_ADDRESSBOOK           "https://omega.contacts.msn.com/abservice/abservice.asmx"
++#define SERVICE_URL_ADDRESSBOOK           "https://local-sn.contacts.msn.com/abservice/abservice.asmx"
+ 
+ /**
+  * @brief URL of the Address Book Sharing Service
+  */
+-#define SERVICE_URL_ADDRESSBOOK_SHARING   "https://omega.contacts.msn.com/abservice/SharingService.asmx"
+-
++#define SERVICE_URL_ADDRESSBOOK_SHARING   "https://local-sn.contacts.msn.com/abservice/SharingService.asmx"
+ 
+ 
+ /**
+Index: kmess-2.0.6/src/network/soap/httpsoapconnection.cpp
+===================================================================
+--- kmess-2.0.6.orig/src/network/soap/httpsoapconnection.cpp
++++ kmess-2.0.6/src/network/soap/httpsoapconnection.cpp
+@@ -546,6 +546,13 @@ void HttpSoapConnection::slotRequestFini
+         kmDebug() << "Received hostname suggestion from:" << originalUrl << "to:" << preferredHostName;
+ #endif
+ 
++        if( preferredHostName.compare("proxy-sn.contacts.msn.com") == 0 )
++        {
++#ifdef KMESSDEBUG_HTTPSOAPCONNECTION_GENERAL
++          kmDebug() << "Overriding hostname" << preferredHostName << "with local-sn.contacts.msn.com";
++#endif
++          preferredHostName = "local-sn.contacts.msn.com";
++ 	}
+         redirectionCounts_[ originalHost ] = 0;
+         redirections_[ originalHost ] = preferredHostName;
+       }
diff --git a/net-im/kmess/kmess-2.0.6-r2.ebuild b/net-im/kmess/kmess-2.0.6-r2.ebuild
new file mode 100644
index 000000000000..3234c41dff57
--- /dev/null
+++ b/net-im/kmess/kmess-2.0.6-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/kmess-2.0.6-r2.ebuild,v 1.1 2011/11/06 10:33:05 hwoarang Exp $
+
+EAPI=3
+
+KDE_LINGUAS="ar ca de el es et fi fr gl hu it ja nl pt_BR ru sk tr zh_CN zh_TW"
+inherit kde4-base
+
+MY_P="${P/_/}"
+
+DESCRIPTION="KMess is an alternative MSN Messenger chat client for Linux"
+HOMEPAGE="http://www.kmess.org"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug gif konqueror libnotify xscreensaver"
+RESTRICT="test"
+
+COMMONDEPEND="
+	app-crypt/qca:2
+	app-crypt/qca-ossl:2
+	dev-libs/libxml2
+	dev-libs/libxslt
+	gif? ( media-libs/giflib )
+	konqueror? ( $(add_kdebase_dep libkonq) )
+	libnotify? ( $(add_kdebase_dep knotify) )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+"
+DEPEND="${COMMONDEPEND}
+	app-text/docbook-xml-dtd:4.2
+	xscreensaver? ( x11-proto/scrnsaverproto )
+"
+RDEPEND="${COMMONDEPEND}
+	konqueror? ( $(add_kdebase_dep konqueror) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-login-fix.patch
+	"${FILESDIR}"/${P}-contact-list.patch
+)
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with gif GIF)
+		$(cmake-utils_use_with konqueror LibKonq)
+		$(cmake-utils_use_want xscreensaver XSCREENSAVER)"
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	echo
+	elog "KMess can use the following optional packages:"
+	elog "- www-plugins/adobe-flash 	provides support for winks"
+	echo
+}