Version bump, bug #317923

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 89 insertions, 1 deletions

diff --git a/net-voip/telepathy-butterfly/ChangeLog b/net-voip/telepathy-butterfly/ChangeLog
index 70046728a2e5..03d396f679a3 100644
--- a/net-voip/telepathy-butterfly/ChangeLog
+++ b/net-voip/telepathy-butterfly/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-voip/telepathy-butterfly
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/ChangeLog,v 1.18 2010/01/06 19:39:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/ChangeLog,v 1.19 2010/05/16 18:24:53 tester Exp $
+
+*telepathy-butterfly-0.5.9 (16 May 2010)
+
+  16 May 2010; Olivier Crête <tester@gentoo.org>
+  +telepathy-butterfly-0.5.9.ebuild,
+  +files/telepathy-butterfly-0.5.9-Disable-libproxy-support.patch:
+  Version bump, bug #317923
 
   06 Jan 2010; Brent Baude <ranger@gentoo.org>
   telepathy-butterfly-0.5.1.ebuild:
diff --git a/net-voip/telepathy-butterfly/files/telepathy-butterfly-0.5.9-Disable-libproxy-support.patch b/net-voip/telepathy-butterfly/files/telepathy-butterfly-0.5.9-Disable-libproxy-support.patch
new file mode 100644
index 000000000000..6a23da4a9ae8
--- /dev/null
+++ b/net-voip/telepathy-butterfly/files/telepathy-butterfly-0.5.9-Disable-libproxy-support.patch
@@ -0,0 +1,46 @@
+From bbe56f4018ba01575b7fbb8a8c14d3e5bb822caa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <tester@tester.ca>
+Date: Sun, 16 May 2010 14:11:50 -0400
+Subject: [PATCH] Disable libproxy support
+
+---
+ butterfly/connection.py |   16 ----------------
+ 1 files changed, 0 insertions(+), 16 deletions(-)
+
+diff --git a/butterfly/connection.py b/butterfly/connection.py
+index 359b01a..9a2f73b 100644
+--- a/butterfly/connection.py
++++ b/butterfly/connection.py
+@@ -100,7 +100,6 @@ class ButterflyConnection(telepathy.server.Connection,
+             # If the HTTP proxy parameters have been set, don't try any
+             # others proxies automatically.
+             if 'http' not in self._proxies:
+-                self._fill_suggested_proxies()
+                 self._use_next_proxy()
+ 
+             self._manager = weakref.proxy(manager)
+@@ -148,21 +147,6 @@ class ButterflyConnection(telepathy.server.Connection,
+         papyon.event.InviteEventInterface.__init__(self, self._msn_client)
+         papyon.event.OfflineMessagesEventInterface.__init__(self, self._msn_client)
+ 
+-    def _fill_suggested_proxies(self):
+-        try:
+-            import libproxy
+-        except ImportError:
+-            return
+-
+-        factory = libproxy.ProxyFactory()
+-        proxies = factory.getProxies('http://gateway.messenger.msn.com/')
+-
+-        # Remove socks proxies that papyon doesn't support.
+-        proxies = [p for p in proxies if p.startswith('http://') or p == 'direct://']
+-
+-        if proxies:
+-            self._suggested_proxies = proxies
+-
+     def _use_next_proxy(self):
+         if not self._suggested_proxies:
+             return False
+-- 
+1.6.4.4
+
diff --git a/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.9.ebuild b/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.9.ebuild
new file mode 100644
index 000000000000..1b34b511468f
--- /dev/null
+++ b/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.9.ebuild,v 1.1 2010/05/16 18:24:53 tester Exp $
+
+EAPI="2"
+NEED_PYTHON="2.5"
+
+inherit python multilib eutils
+
+DESCRIPTION="An MSN connection manager for Telepathy"
+HOMEPAGE="http://telepathy.freedesktop.org/releases/telepathy-butterfly/"
+SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/telepathy-python-0.15.17
+	>=dev-python/papyon-0.4.2"
+
+DOCS="AUTHORS NEWS"
+
+src_prepare() {
+	#Disabled because it crashes against 0.2.3 that is in the tree
+	#When a newer version is added, we have to force a dep on it
+	#like this and remove this patch
+	# libproxy? ( >=net-libs/libproxy-0.3.1 )
+	# !<net-libs/libproxy-0.3
+	epatch "${FILESDIR}"/telepathy-butterfly-0.5.9-Disable-libproxy-support.patch
+}
+
+src_install() {
+	make install DESTDIR="${D}"
+}