Apply upstream patch to fix connection to the contacts server - https://bugs.freedesktop.org/show_bug.cgi?id=31004

The patch was downloaded from https://bugs.freedesktop.org/attachment.cgi?id=39599
Non-maintainer commit with ok from chithead.

Package-Manager: portage-2.2_rc97/cvs/Linux x86_64

4 files changed, 60 insertions, 12 deletions

diff --git a/dev-python/papyon/ChangeLog b/dev-python/papyon/ChangeLog
index c29f34fcb20e..32514e246e48 100644
--- a/dev-python/papyon/ChangeLog
+++ b/dev-python/papyon/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-python/papyon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/papyon/ChangeLog,v 1.15 2010/09/29 10:08:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/papyon/ChangeLog,v 1.16 2010/10/21 02:27:56 jmbsvicetto Exp $
+
+*papyon-0.5.1-r1 (21 Oct 2010)
+
+  21 Oct 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +papyon-0.5.1-r1.ebuild, +files/papyon-0.5.1-contacts-fix.patch:
+  Apply upstream patch to fix connection to the contacts server -
+  https://bugs.freedesktop.org/show_bug.cgi?id=31004
+  The patch was downloaded from
+  https://bugs.freedesktop.org/attachment.cgi?id=39599
+  Non-maintainer commit with ok from chithead.
 
 *papyon-0.5.1 (29 Sep 2010)
 
diff --git a/dev-python/papyon/Manifest b/dev-python/papyon/Manifest
index da746693d8c3..a855f1e7ca65 100644
--- a/dev-python/papyon/Manifest
+++ b/dev-python/papyon/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX papyon-0.5.1-contacts-fix.patch 745 RMD160 6572708bdc6b917fcd5b334d935bc92955fe9688 SHA1 0f93dd4f3ce2b766c1fb85f00fbd531877cc4724 SHA256 d5e41056c037f58cfc0880547233c588b7bb98b8eb7774c46e9662477a9efc15
 DIST papyon-0.4.6.tar.gz 158683 RMD160 084316d60c053b49577bafff8dbf79280f9d7d19 SHA1 ead88deaa47648697e27f20b37ab4a3e87e6d7fb SHA256 e10cecc79c64061d6c82114f0290617008403264cdc6aacdf198b07e8863f5a6
 DIST papyon-0.5.1.tar.gz 176433 RMD160 252cac070266ffe30cff05e7570714e32ce46119 SHA1 59d3eb7b0e233340e1a82c0917c7d641a09beea8 SHA256 86e1a4e8f5190d36590fe0aa30883c76f33891b1b871a21a5fd40213c7b67796
 EBUILD papyon-0.4.6.ebuild 634 RMD160 beb9f91114f5e75cc9ad28052a3c9619b2ceec2e SHA1 41018dae8234fffd0959a5a906199080af243086 SHA256 5a8051df140776af26e8a342c6cb8276692274f00123218257d714723a0e5b61
+EBUILD papyon-0.5.1-r1.ebuild 1031 RMD160 90e9a9ea093ab357d2d315997780ea76c05827ce SHA1 1fe39b9211c5273c7e6015249df76e9f70490715 SHA256 cb592d20eb1c7e220b4514d550793747d901d157a220ae3cef1cae167c0fce11
 EBUILD papyon-0.5.1.ebuild 719 RMD160 d1e458c77118a62a0638998403d8b4f5fe501c5b SHA1 90b92696b362a6afe4f0b7c8d4a5145452cec027 SHA256 cbf9cddc557efc3dda4635cf3d1a235a4ab9dbb449e8f23e68763cff25ee090c
-MISC ChangeLog 1965 RMD160 23f8d9fea75e5ae9f6cd2d0cba10d3e751a47e35 SHA1 a6e701adac5183a5cc3870a26dbfbf363e1e5d9e SHA256 c26acc467a11d1170735119a3a31f6d9cf520e4ab8053436159cd18f70b93e68
+MISC ChangeLog 2391 RMD160 447ed30af5c7c8b379589e79e52aae3bc2268030 SHA1 a66746e471ab6d7c8fd66fb6bb5a820bdbf6c97f SHA256 179aeeb80c7c6d22f1a22957bc5415b2c58ba39dced75d9587d5a29db9a0ef81
 MISC metadata.xml 223 RMD160 daee00fa7e550db22537ca7c8274eae7fce35e62 SHA1 5669a7136c6d4a23d83836defadf6ed875800aa6 SHA256 c66727831cee51b5d5d5364a49c1999ec787d5e67fd26847215bf7160466bb0c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyjEDEACgkQCaWpQKGI+9QojwCgiA+cOHScv5yz6zsNomdwfvCG
-A7YAn27zYOhz2Ev2z6lvI59VSfF7tKCx
-=yRDE
------END PGP SIGNATURE-----
diff --git a/dev-python/papyon/files/papyon-0.5.1-contacts-fix.patch b/dev-python/papyon/files/papyon-0.5.1-contacts-fix.patch
new file mode 100644
index 000000000000..a116807b288f
--- /dev/null
+++ b/dev-python/papyon/files/papyon-0.5.1-contacts-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/papyon/service/description/SingleSignOn/RequestMultipleSecurityTokens.py b/papyon/service/description/SingleSignOn/RequestMultipleSecurityTokens.py
+index 73c1127..42d7497 100644
+--- a/papyon/service/description/SingleSignOn/RequestMultipleSecurityTokens.py
++++ b/papyon/service/description/SingleSignOn/RequestMultipleSecurityTokens.py
+@@ -21,7 +21,7 @@
+ import xml.sax.saxutils as xml
+ 
+ class LiveService(object):
+-    CONTACTS = ("contacts.msn.com", "?fs=1&id=24000&kv=7&rn=93S9SWWw&tw=0&ver=2.1.6000.1")
++    CONTACTS = ("contacts.msn.com", "MBI")
+     MESSENGER = ("messenger.msn.com", "?id=507")
+     MESSENGER_CLEAR = ("messengerclear.live.com", "MBI_KEY_OLD")
+     MESSENGER_SECURE = ("messengersecure.live.com", "MBI_SSL")
diff --git a/dev-python/papyon/papyon-0.5.1-r1.ebuild b/dev-python/papyon/papyon-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..348d9a9f1544
--- /dev/null
+++ b/dev-python/papyon/papyon-0.5.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/papyon/papyon-0.5.1-r1.ebuild,v 1.1 2010/10/21 02:27:58 jmbsvicetto Exp $
+
+EAPI=2
+
+inherit distutils eutils
+
+DESCRIPTION="Python MSN IM protocol implementation forked from pymsn"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/papyon"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/python-2.5
+	>=dev-python/pygobject-2.10
+	>=dev-python/pyopenssl-0.6
+	dev-python/gst-python
+	dev-python/pycrypto
+	net-libs/farsight2[python]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Apply upstream patch to fix connection to the contacts server
+	# https://bugs.freedesktop.org/show_bug.cgi?id=31004
+	# https://bugs.freedesktop.org/attachment.cgi?id=39599
+	epatch "${FILESDIR}/${P}-contacts-fix.patch" || die "Failed to apply patch."
+
+	distutils_src_prepare
+}