Remove bad import from im module (bug #355499 by Travis Hansen) and use python2 as it still doesn't work with python3.

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

4 files changed, 97 insertions, 2 deletions

diff --git a/net-voip/telepathy-butterfly/ChangeLog b/net-voip/telepathy-butterfly/ChangeLog
index 2bc5ebd20e13..3296421de9f0 100644
--- a/net-voip/telepathy-butterfly/ChangeLog
+++ b/net-voip/telepathy-butterfly/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-voip/telepathy-butterfly
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/ChangeLog,v 1.32 2011/02/07 19:26:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/ChangeLog,v 1.33 2011/02/19 12:00:10 pacho Exp $
+
+*telepathy-butterfly-0.5.15-r1 (19 Feb 2011)
+
+  19 Feb 2011; Pacho Ramos <pacho@gentoo.org>
+  +telepathy-butterfly-0.5.15-r1.ebuild,
+  +files/telepathy-butterfly-0.5.15-fix-import.patch:
+  Remove bad import from im module (bug #355499 by Travis Hansen) and use
+  python2 as it still doesn't work with python3.
 
   07 Feb 2011; Pacho Ramos <pacho@gentoo.org>
   telepathy-butterfly-0.5.15.ebuild:
diff --git a/net-voip/telepathy-butterfly/Manifest b/net-voip/telepathy-butterfly/Manifest
index 780d31983fa2..50c955423b6f 100644
--- a/net-voip/telepathy-butterfly/Manifest
+++ b/net-voip/telepathy-butterfly/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX telepathy-butterfly-0.5.15-fix-import.patch 834 RMD160 6b46d4c7acea3a44893268f861c6c2e167d9a1bf SHA1 ec3a84e8912ec60b7d4399fbe723e59974d7917b SHA256 ddbd37920e21ba6bfe5e0d32f99bd2d79f668b666cbe47e2e3f6b1569a01431e
 AUX telepathy-butterfly-0.5.9-Disable-libproxy-support.patch 1673 RMD160 6924481831167403462244a9d78126838693b140 SHA1 196b460663bd7424d26fffb3748641028c199fba SHA256 29d28099ecf12e8f6e5182778284d0d02c962259711447c533b3d31825583b04
 DIST telepathy-butterfly-0.5.14.tar.gz 161312 RMD160 2e955ea7de870ff61da56c93c9c54f25b61ad94c SHA1 b3efa9596aad8858f4f87f3fe42d167e9a18db9e SHA256 dd38b5b3a8fb0305a9b4cf924132cd65f5463e4b28d470ebafaecffa8c213b9f
 DIST telepathy-butterfly-0.5.15.tar.gz 160946 RMD160 7b747c922428352d7fc92d2939918a005f321bda SHA1 73c9dba9f97ae5a6d981485e5f51c5930168f8ce SHA256 d48eef7f938c2b5bb805dd6bbbcde673b1c6526ca15af6b5f8fe03d926d35b90
 DIST telepathy-butterfly-0.5.9.tar.gz 147491 RMD160 90ffd9a31ca7297e6684946d620253c4fcc7206c SHA1 95427d658a9ca2e3aae894fbdf9121d4efe09743 SHA256 add3d4d298e763175133e2632b99745b2974502587499ec88fde9d139343f136
 EBUILD telepathy-butterfly-0.5.14.ebuild 884 RMD160 b7ca611cf99f0196b4aa2cc7058b82b319720d6a SHA1 2c384fa8b57fc89d3d12a5b154f245937146c2e4 SHA256 32a5e305c7d7a1463d222b1cf404e08a0af65b618e5ede9f6d984500907ed123
+EBUILD telepathy-butterfly-0.5.15-r1.ebuild 1215 RMD160 1bf30b212c8030f9ea1ef0279ae92d726c3a30b1 SHA1 1ef16276f4b6c1d2d84808bbfec73510d737ab1a SHA256 96606d0f9623581eef2e31fad71cd5baecb44417c5eaae50ac239168cfafcd4b
 EBUILD telepathy-butterfly-0.5.15.ebuild 1041 RMD160 f009ed40f7c8cd13149fe527d97fe0d006b2696d SHA1 41b02205959e087c6f73328223f06df764be885e SHA256 badb0e59f3a986ee2de5fc7bbb73112a706b85da64dd8b885981cd5826e58cd6
 EBUILD telepathy-butterfly-0.5.9.ebuild 1063 RMD160 d4ad71331179310c4a16a41a1f8105ce8f1e1889 SHA1 3ece17700f7457cf57fc53624e893e2dc93a5ccd SHA256 a3f2cfe3cf80a04b510e0003327685e9ff88a29c77a294ec767012a11789e8d1
-MISC ChangeLog 5043 RMD160 57778605a686f1abb589352df3af97e4ed298ae2 SHA1 6b670b0f5174175016518819f6efa409ff76947b SHA256 7dea4fe0fa1d2eb2401fff56114f5c8c43e3ec98c960cd5db3a7d01cee10ab72
+MISC ChangeLog 5354 RMD160 4cf21662c0804be95fd21f5002cfd6716223fa4e SHA1 6f95ae5e5294d8a2f93c168b7d1b838556e8764a SHA256 cfd40cac1d3933bbf10e4346089fb4877295b451ef62a0c15330d779efcc9b37
 MISC metadata.xml 271 RMD160 8229482f149758e1e3c171f42d06ffb45151a553 SHA1 8dec4fab99bf83042b558ee5509e953c61319fd7 SHA256 e2790b5aff096cfa3660cee371fadbbfe151f2e96fa9b321ef8845707e0823af
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk1fsM8ACgkQCaWpQKGI+9SEFACeIgZZj9cwaW8MdS0P61sedE/m
++BYAnjF2tYGyjeRu866RBI6YrwAgHwHL
+=lN5a
+-----END PGP SIGNATURE-----
diff --git a/net-voip/telepathy-butterfly/files/telepathy-butterfly-0.5.15-fix-import.patch b/net-voip/telepathy-butterfly/files/telepathy-butterfly-0.5.15-fix-import.patch
new file mode 100644
index 000000000000..adb6825d2cb6
--- /dev/null
+++ b/net-voip/telepathy-butterfly/files/telepathy-butterfly-0.5.15-fix-import.patch
@@ -0,0 +1,27 @@
+From 18b44dd2909b2cb75e8cc91a80f6e6b8ba253a7f Mon Sep 17 00:00:00 2001
+From: Ionut Biru <ibiru@archlinux.org>
+Date: Mon, 6 Dec 2010 04:22:45 -0800
+Subject: [PATCH] bugfix: remove bad import from im module
+
+Signed-off-by: Ionut Biru <ibiru@archlinux.org>
+Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
+---
+ butterfly/channel/im.py |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/butterfly/channel/im.py b/butterfly/channel/im.py
+index 1781234..ac8dd44 100644
+--- a/butterfly/channel/im.py
++++ b/butterfly/channel/im.py
+@@ -30,8 +30,6 @@ import papyon.event
+ 
+ from butterfly.channel.text import ButterflyTextChannel
+ 
+-from butterfly.Channel_Interface_Conference import CHANNEL_INTERFACE_CONFERENCE
+-
+ __all__ = ['ButterflyImChannel']
+ 
+ logger = logging.getLogger('Butterfly.ImChannel')
+-- 
+1.7.2.3
+
diff --git a/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.15-r1.ebuild b/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.15-r1.ebuild
new file mode 100644
index 000000000000..38a88e695b7c
--- /dev/null
+++ b/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.15-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 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.15-r1.ebuild,v 1.1 2011/02/19 12:00:10 pacho Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.5"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
+PYTHON_EXPORT_PHASE_FUNCTIONS="1"
+
+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 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/telepathy-python-0.15.17
+	>=dev-python/papyon-0.5.1
+	>=net-libs/libproxy-0.3.1[python]"
+
+DOCS="AUTHORS NEWS"
+
+src_prepare() {
+	# Remove bad import from im module, bug #355499
+	epatch "${FILESDIR}/${P}-fix-import.patch"
+
+	# disable pyc compiling
+	mv py-compile py-compile-disabled
+	ln -s $(type -P true) py-compile
+
+	# It doesn't really support python3 yet
+	python_convert_shebangs -r 2 .
+
+	python_src_prepare
+}
+
+pkg_postinst() {
+	python_mod_optimize butterfly
+}
+
+pkg_postrm() {
+	python_mod_cleanup butterfly
+}