commit: 5c4b20b1eccb501b393f69cf60b578733c629b70 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Oct 27 07:32:09 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Oct 27 07:32:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c4b20b1
net-voip/telepathy-haze: Remove last-rited pkg Closes: https://bugs.gentoo.org/714636 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> net-voip/telepathy-haze/Manifest | 1 - .../files/telepathy-haze-0.8.0-crash.patch | 28 ----------- ...elepathy-haze-0.8.0-pidgin-2.10.12-compat.patch | 22 --------- net-voip/telepathy-haze/metadata.xml | 8 ---- .../telepathy-haze/telepathy-haze-0.8.0-r2.ebuild | 56 ---------------------- profiles/base/package.use.mask | 4 -- profiles/package.mask | 6 --- 7 files changed, 125 deletions(-) diff --git a/net-voip/telepathy-haze/Manifest b/net-voip/telepathy-haze/Manifest deleted file mode 100644 index c015ff7920e..00000000000 --- a/net-voip/telepathy-haze/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST telepathy-haze-0.8.0.tar.gz 580929 BLAKE2B 08c5a10de978b9d75270ed9408612021974d8fcecff3b8613abeea09280253867957b812d4c3b500e95c5f5992a799bfc54b9497ba0f01507051f7d414cd9b14 SHA512 2739b37b1f95f0996b423c0883f369e1283363e39cb1b0566e2573f3cebdab0530ffd1d4d515202e300407029227b75b4e8c459167d584000405fda2d070699d diff --git a/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-crash.patch b/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-crash.patch deleted file mode 100644 index 2c480bbd746..00000000000 --- a/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-crash.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 83589722731dde63118104f75c9ab89f66b21c21 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray <debars...@freedesktop.org> -Date: Tue, 28 Apr 2015 19:13:39 +0200 -Subject: [PATCH] contact-list: Don't crash if a contact is already in the - roster - -Bug: https://bugs.freedesktop.org/show_bug.cgi?id=47005 ---- - src/contact-list.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/contact-list.c b/src/contact-list.c -index fc46de8..710ed19 100644 ---- a/src/contact-list.c -+++ b/src/contact-list.c -@@ -532,7 +532,8 @@ haze_contact_list_request_subscription (HazeContactList *self, - /* If the buddy already exists, then it should already be on the - * subscribe list. - */ -- g_assert (purple_find_buddy (account, bname) == NULL); -+ if (purple_find_buddy (account, bname) != NULL) -+ return; - - buddy = purple_buddy_new (account, bname, NULL); - --- -2.1.0 - diff --git a/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch b/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch deleted file mode 100644 index 9785debec9a..00000000000 --- a/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/media-stream.c -+++ b/src/media-stream.c -@@ -23,6 +23,7 @@ - #include "config.h" - #include "media-stream.h" - -+#include <libpurple/version.h> - #include <libpurple/media/backend-iface.h> - #include <string.h> - #include <telepathy-glib/dbus.h> -@@ -1076,7 +1077,11 @@ haze_media_stream_new_native_candidate ( - if (proto == TP_MEDIA_STREAM_BASE_PROTO_UDP) - protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_UDP; - else if (proto == TP_MEDIA_STREAM_BASE_PROTO_TCP) -+#if PURPLE_VERSION_CHECK (2, 10, 12) -+ protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_PASSIVE; -+#else - protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_TCP; -+#endif - else - DEBUG ("Unknown network protocol"); - diff --git a/net-voip/telepathy-haze/metadata.xml b/net-voip/telepathy-haze/metadata.xml deleted file mode 100644 index 996e7cacd21..00000000000 --- a/net-voip/telepathy-haze/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> - <maintainer type="project"> - <email>gn...@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> -</pkgmetadata> diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild deleted file mode 100644 index 3a90c52fe39..00000000000 --- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 - -DESCRIPTION="Telepathy connection manager providing libpurple supported protocols" -HOMEPAGE="https://telepathy.freedesktop.org https://developer.pidgin.im/wiki/TelepathyHaze"; -SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=net-im/pidgin-2.7[dbus] - >=net-libs/telepathy-glib-0.15.1 - >=dev-libs/glib-2.30:2 - >=dev-libs/dbus-glib-0.73 -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-libs/libxslt - dev-util/glib-utils - virtual/pkgconfig - test? ( - dev-python/pygobject:2 - $(python_gen_any_dep 'dev-python/twisted[${PYTHON_USEDEP}]') - ) -" - -PATCHES=( - # contact-list: Don't crash if a contact is already in the roster - # (fixed in next version) - "${FILESDIR}"/${P}-crash.patch - - # Fix compat with newer pidgin versions, bug #572296 - "${FILESDIR}"/${P}-pidgin-2.10.12-compat.patch -) - -python_check_deps() { - if use test ; then - has_version "dev-python/twisted[${PYTHON_USEDEP}]" - fi -} - -src_prepare() { - default - # Disable failing test - sed -i 's|simple-caps.py||' -i tests/twisted/Makefile.{am,in} || die -} diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 0aa8086ccf9..b4559818594 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -61,10 +61,6 @@ sci-geosciences/qgis grass # CMake checks will only allow on amd64 & x86 dev-db/mariadb columnstore -# Michał Górny <mgo...@gentoo.org> (2020-08-01) -# Require dev-python/twisted with py2.7. -net-voip/telepathy-haze test - # Michał Górny <mgo...@gentoo.org> (2020-08-01) # dev-python/distributed is going to be last rited. dev-python/joblib doc diff --git a/profiles/package.mask b/profiles/package.mask index 9c149bae67d..92798e6fa52 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -238,12 +238,6 @@ media-gfx/pinta # Bug #741468, removal in 30 days. games-board/spider -# Michał Górny <mgo...@gentoo.org> (2020-09-27) -# Discontinued upstream. Not ported to Python 3, and no patches seem -# readily available. -# Removal in 30 days. Bug #714636. -net-voip/telepathy-haze - # Michał Górny <mgo...@gentoo.org> (2020-09-25) # PyPy3.7 alpha. Known to break a few packages. Masked until it # matures more.
