dev-python/papyon and net-voip/telepathy-butterfly removal. Bug #362611

7 files changed, 0 insertions, 358 deletions

diff --git a/net-voip/telepathy-butterfly/ChangeLog b/net-voip/telepathy-butterfly/ChangeLog
deleted file mode 100644
index 014ffe3c8d4c..000000000000
--- a/net-voip/telepathy-butterfly/ChangeLog
+++ /dev/null
@@ -1,174 +0,0 @@
-# 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.38 2011/05/08 10:44:49 pacho Exp $
-
-  08 May 2011; Pacho Ramos <pacho@gentoo.org>
-  -telepathy-butterfly-0.5.14.ebuild, -telepathy-butterfly-0.5.15.ebuild:
-  Remove old.
-
-  12 Mar 2011; Raúl Porcel <armin76@gentoo.org>
-  telepathy-butterfly-0.5.15-r1.ebuild:
-  alpha/ia64/sparc stable wrt #353436
-
-  26 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org>
-  telepathy-butterfly-0.5.15-r1.ebuild:
-  Marked ~ppc wrt #339085
-
-  24 Feb 2011; Thomas Kahle <tomka@gentoo.org>
-  telepathy-butterfly-0.5.15-r1.ebuild:
-  x86 stable per bug 353436
-
-  23 Feb 2011; Markos Chandras <hwoarang@gentoo.org>
-  telepathy-butterfly-0.5.15-r1.ebuild:
-  Stable on amd64 wrt bug #353436
-
-*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:
-  Restrict python3 as it wasn't really working (thanks again to Arfrever).
-
-  07 Feb 2011; Pacho Ramos <pacho@gentoo.org>
-  telepathy-butterfly-0.5.15.ebuild:
-  Fix python handling, thanks to Arfrever.
-
-  07 Feb 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
-  Add gnome to metadata as talked between us since empathy relies on this.
-
-*telepathy-butterfly-0.5.15 (07 Feb 2011)
-
-  07 Feb 2011; Pacho Ramos <pacho@gentoo.org>
-  +telepathy-butterfly-0.5.15.ebuild:
-  Version bump with bugfixes and also allowing compilation for python2 and 3.
-
-  29 Sep 2010; Pacho Ramos <pacho@gentoo.org>
-  telepathy-butterfly-0.5.14.ebuild, metadata.xml:
-  libproxy RDEPEND is not really optional as reported in bug #339127 by
-  Priit Laes.
-
-*telepathy-butterfly-0.5.14 (29 Sep 2010)
-
-  29 Sep 2010; Pacho Ramos <pacho@gentoo.org>
-  -telepathy-butterfly-0.5.1.ebuild, +telepathy-butterfly-0.5.14.ebuild:
-  Version bump with bugfixes, handle libproxy optional RDEPEND now that 0.4
-  is in the tree, disable pyc/pyo compiling (bug #233948 by Flameeyes), use
-  'emake' instead of plain 'make'. Remove old.
-
-  07 Aug 2010; Raúl Porcel <armin76@gentoo.org>
-  telepathy-butterfly-0.5.9.ebuild:
-  ia64/sparc stable wrt #321591
-
-  01 Aug 2010; Christian Faulhammer <fauli@gentoo.org>
-  telepathy-butterfly-0.5.9.ebuild:
-  stable x86, bug 321591
-
-  31 Jul 2010; Pacho Ramos <pacho@gentoo.org>
-  telepathy-butterfly-0.5.9.ebuild:
-  amd64 stable, bug 321591
-
-  25 Jul 2010; Tobias Klausmann <klausman@gentoo.org>
-  telepathy-butterfly-0.5.9.ebuild:
-  Stable on alpha, bug #321591
-
-  08 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  telepathy-butterfly-0.5.1.ebuild, telepathy-butterfly-0.5.9.ebuild:
-  Use PYTHON_DEPEND instead of NEED_PYTHON.
-
-  27 Jun 2010; <nixnut@gentoo.org> telepathy-butterfly-0.5.9.ebuild:
-  ppc stable #321519
-
-  14 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  telepathy-butterfly-0.5.1.ebuild:
-  Delete deprecation warnings (bug #315881).
-
-*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:
-  Marking telepathy-butterfly-0.5.1 ~ppc64 for bug 245949
-
-  05 Jan 2010; Joseph Jezak <josejx@gentoo.org>
-  telepathy-butterfly-0.5.1.ebuild:
-  Marked ~ppc for bug #245949.
-
-  25 Oct 2009; Torsten Veller <tove@gentoo.org> metadata.xml:
-  Remove coldwind from metadata.xml (#181764)
-
-  19 Oct 2009; Raúl Porcel <armin76@gentoo.org>
-  telepathy-butterfly-0.5.1.ebuild:
-  Add ~ia64/~sparc wrt #283065
-
-*telepathy-butterfly-0.5.1 (14 Sep 2009)
-
-  14 Sep 2009; Olivier Crête <tester@gentoo.org>
-  -telepathy-butterfly-0.5.0.ebuild, +telepathy-butterfly-0.5.1.ebuild:
-  Version bump
-
-*telepathy-butterfly-0.5.0 (28 Aug 2009)
-
-  28 Aug 2009; Olivier Crête <tester@gentoo.org>
-  -telepathy-butterfly-0.3.1.ebuild, -telepathy-butterfly-0.3.2.ebuild,
-  +telepathy-butterfly-0.5.0.ebuild:
-  Version bump, old didn't work with new telepathy-python
-
-  07 Jan 2009; Raúl Porcel <armin76@gentoo.org>
-  telepathy-butterfly-0.3.2.ebuild:
-  Add ~alpha/~ia64 wrt #245949
-
-  24 Dec 2008; Friedrich Oslage <bluebird@gentoo.org>
-  telepathy-butterfly-0.3.2.ebuild:
-  Add ~sparc keyword, bug #245949
-
-  26 Sep 2008; Santiago M. Mola <coldwind@gentoo.org>
-  telepathy-butterfly-0.3.2.ebuild:
-  Fix build when MAKEOPTS contains options different than -j, fixes #233943.
-
-*telepathy-butterfly-0.3.2 (20 Aug 2008)
-
-  20 Aug 2008; Olivier Crête <tester@gentoo.org>
-  +telepathy-butterfly-0.3.2.ebuild:
-  Version bump
-
-  13 Jun 2008; Santiago M. Mola <coldwind@gentoo.org>
-  -telepathy-butterfly-0.3.0.ebuild:
-  Remove old.
-
-  29 May 2008; Ali Polatel <hawking@gentoo.org>
-  telepathy-butterfly-0.3.0.ebuild, telepathy-butterfly-0.3.1.ebuild:
-  python_mod_optimize is ROOT aware.
-
-  29 May 2008; Ali Polatel <hawking@gentoo.org>
-  telepathy-butterfly-0.3.0.ebuild, telepathy-butterfly-0.3.1.ebuild:
-  Fixed python_mod_optimize.
-
-*telepathy-butterfly-0.3.1 (16 Jan 2008)
-
-  16 Jan 2008; Santiago M. Mola <coldwind@gentoo.org>
-  +telepathy-butterfly-0.3.1.ebuild:
-  Version bump.
-
-*telepathy-butterfly-0.3.0 (13 Jan 2008)
-
-  13 Jan 2008; Santiago M. Mola <coldwind@gentoo.org>
-  -telepathy-butterfly-0.1.4.ebuild, +telepathy-butterfly-0.3.0.ebuild:
-  Version bump and remove old, fixes #194657.
-
-  03 Jul 2007; Santiago M. Mola <coldwind@gentoo.org> metadata.xml:
-  Update metadata.
-
-*telepathy-butterfly-0.1.4 (10 Jun 2007)
-
-  10 Jun 2007; Santiago M. Mola <gentoo@coldwind.org> +telepathy-butterfly-0.1.4.ebuild:
-  Initial import from the voip overlay.
-
diff --git a/net-voip/telepathy-butterfly/Manifest b/net-voip/telepathy-butterfly/Manifest
deleted file mode 100644
index d01cefbda688..000000000000
--- a/net-voip/telepathy-butterfly/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
------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.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.15-r1.ebuild 1219 RMD160 6daef72659b85eb49591eff83d9db94aadd153f0 SHA1 f68c7ab9359b2d9b098df6eef1a6b327a95c307d SHA256 31d8c710681ee4ceadc4134d61742d5e4552f4610a0feb951b6a104c3d2cf8eb
-EBUILD telepathy-butterfly-0.5.9.ebuild 1063 RMD160 d4ad71331179310c4a16a41a1f8105ce8f1e1889 SHA1 3ece17700f7457cf57fc53624e893e2dc93a5ccd SHA256 a3f2cfe3cf80a04b510e0003327685e9ff88a29c77a294ec767012a11789e8d1
-MISC ChangeLog 5982 RMD160 a5f98476177abf00dcdb352d2f7339910b05e5fa SHA1 ac5e9b8dbb8ab400836a7a82b40379746ee3f7da SHA256 b607bce339b28d4a58ea406755967bca59a6df9a00c4cc1e4bf2281e696c3aea
-MISC metadata.xml 271 RMD160 8229482f149758e1e3c171f42d06ffb45151a553 SHA1 8dec4fab99bf83042b558ee5509e953c61319fd7 SHA256 e2790b5aff096cfa3660cee371fadbbfe151f2e96fa9b321ef8845707e0823af
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQECAAYFAk6MmrIACgkQIiMqcbOVdxQxEwP+JtZ4t/mOBuM4YmzCvS9qCXc3
-/IaNapO9S4P6v9GLB8y51Og2Lw4r/ABlXlqli04JN37MUotLMMZtLlVkkT5P8jQ2
-FhOSguUgW1FzOND2mcibWBo+eliaBbLjHTlgZ75qYZIgUFPoDyj6SGQOZBnr31mt
-6Flfyj6GusyRmxizsAk=
-=jrR2
------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
deleted file mode 100644
index adb6825d2cb6..000000000000
--- a/net-voip/telepathy-butterfly/files/telepathy-butterfly-0.5.15-fix-import.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/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
deleted file mode 100644
index 6a23da4a9ae8..000000000000
--- a/net-voip/telepathy-butterfly/files/telepathy-butterfly-0.5.9-Disable-libproxy-support.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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/metadata.xml b/net-voip/telepathy-butterfly/metadata.xml
deleted file mode 100644
index a804a7bfe7c7..000000000000
--- a/net-voip/telepathy-butterfly/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>gnome</herd>
-	<herd>voip</herd>
-	<longdescription lang="en">Telepathy connection manager for MSN network.
-</longdescription>
-</pkgmetadata>
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
deleted file mode 100644
index 275d4a374a1d..000000000000
--- a/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.15-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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.6 2011/10/05 17:58:04 xarthisius 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 ppc ~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
-}
diff --git a/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.9.ebuild b/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.9.ebuild
deleted file mode 100644
index 8dae111bbe3d..000000000000
--- a/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.9.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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.7 2010/08/07 16:52:12 armin76 Exp $
-
-EAPI="2"
-PYTHON_DEPEND="2: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}"
-}