summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Crête <tester@gentoo.org>2010-05-16 18:24:53 +0000
committerOlivier Crête <tester@gentoo.org>2010-05-16 18:24:53 +0000
commitf49e8fedd931a9c55f50af38f6e28beaa68dc1eb (patch)
tree002cfb0062fa5cf9ea4335b95819a212fb645bbd /net-voip
parentVersion bump, bug #317923 (diff)
downloadhistorical-f49e8fedd931a9c55f50af38f6e28beaa68dc1eb.tar.gz
historical-f49e8fedd931a9c55f50af38f6e28beaa68dc1eb.tar.bz2
historical-f49e8fedd931a9c55f50af38f6e28beaa68dc1eb.zip
Version bump, bug #317923
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'net-voip')
-rw-r--r--net-voip/telepathy-butterfly/ChangeLog9
-rw-r--r--net-voip/telepathy-butterfly/Manifest15
-rw-r--r--net-voip/telepathy-butterfly/files/telepathy-butterfly-0.5.9-Disable-libproxy-support.patch46
-rw-r--r--net-voip/telepathy-butterfly/telepathy-butterfly-0.5.9.ebuild35
4 files changed, 103 insertions, 2 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/Manifest b/net-voip/telepathy-butterfly/Manifest
index f22384238456..914234f10028 100644
--- a/net-voip/telepathy-butterfly/Manifest
+++ b/net-voip/telepathy-butterfly/Manifest
@@ -1,4 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX telepathy-butterfly-0.5.9-Disable-libproxy-support.patch 1673 RMD160 6924481831167403462244a9d78126838693b140 SHA1 196b460663bd7424d26fffb3748641028c199fba SHA256 29d28099ecf12e8f6e5182778284d0d02c962259711447c533b3d31825583b04
DIST telepathy-butterfly-0.5.1.tar.gz 295717 RMD160 e8c3787d834d745dd85b3186185161fcb5d01c45 SHA1 1968bb494863352a2f293bb9570d64dc4ec33ddf SHA256 5c34165a2725bae24a4c6e496d34b42d927d732c6a152283661796e2c98fdbee
+DIST telepathy-butterfly-0.5.9.tar.gz 147491 RMD160 90ffd9a31ca7297e6684946d620253c4fcc7206c SHA1 95427d658a9ca2e3aae894fbdf9121d4efe09743 SHA256 add3d4d298e763175133e2632b99745b2974502587499ec88fde9d139343f136
EBUILD telepathy-butterfly-0.5.1.ebuild 1190 RMD160 2840a95dfb96ee2c5628d3b57d6618bcf03da8d9 SHA1 bee41b7ae7a3c523a36bc82d6bd46f5e055040a2 SHA256 97011b9b03432c2cbd86477b5106bc17a8f4ab8b9641d1161861ec00b68b6c16
-MISC ChangeLog 2744 RMD160 21896573c8e1ce0d2a675ee0e043b37056fd2ed5 SHA1 555cd43a22b2a99f90e61743009dd342be961cbb SHA256 4c1e3a18a3a0ad4ed27c38854542f85f464cf459ddf78b1c5c06b317e581d5cd
+EBUILD telepathy-butterfly-0.5.9.ebuild 1064 RMD160 b0b231db238ea2d6c37035afc6dd406358ba64ce SHA1 c9623d77a44922f0ac8baccf3b32aa895953711a SHA256 05ee5daa94e1ec2b652ce762b67d12405e78283f2052b8c042e3a87184983433
+MISC ChangeLog 2969 RMD160 72b8f2af8f286857432bb50d0420b7e0efb05617 SHA1 7fa831d206cff72315ca21b5c7c902b35e3d9577 SHA256 dbbe9fc9f3279e57d13b4070232c4b02d4544ecc9ad64937cc2c115e8116acce
MISC metadata.xml 253 RMD160 1545f8f08ff6a7cd2c36dbd87c80ccbfe6e222de SHA1 e30d4d9da9b0aeddadfef82930e8dfcb3c1ae6b5 SHA256 634a98614568bd5cc5f8ee82a405c9acd754248e9f234344d4b62830f42ba1a9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkvwOHoACgkQmOfEJZHYOKdMqgCgyWYR6giBnuF1I/nAtURMzuI6
+y40AoMT7PrVYomljGTAg8/liUS9L3z4z
+=0JLx
+-----END PGP SIGNATURE-----
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}"
+}