From b8b348330261e32e83d94f27720d9feb7a5e99d7 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sat, 19 Feb 2011 12:00:10 +0000 Subject: Remove bad import from im module (bug #355499 by Travis Hansen) and use python2 as it still doesn't work with python3. (Portage version: 2.1.9.40/cvs/Linux x86_64) --- net-voip/telepathy-butterfly/ChangeLog | 10 ++++- .../telepathy-butterfly-0.5.15-fix-import.patch | 27 ++++++++++++ .../telepathy-butterfly-0.5.15-r1.ebuild | 48 ++++++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 net-voip/telepathy-butterfly/files/telepathy-butterfly-0.5.15-fix-import.patch create mode 100644 net-voip/telepathy-butterfly/telepathy-butterfly-0.5.15-r1.ebuild 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 + +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 telepathy-butterfly-0.5.15.ebuild: 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 +Date: Mon, 6 Dec 2010 04:22:45 -0800 +Subject: [PATCH] bugfix: remove bad import from im module + +Signed-off-by: Ionut Biru +Signed-off-by: Jonny Lamb +--- + 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 +} -- cgit v1.2.3-65-gdbad