1 |
commit: bb0ee0073efe96e5bf0ae44507c5add30550c891 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 27 04:31:37 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 27 06:17:01 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb0ee007 |
7 |
|
8 |
net-voip/telepathy-salut: Port to py3 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/735436 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
net-voip/telepathy-salut/Manifest | 1 + |
14 |
...ut-0.8.1-r2.ebuild => telepathy-salut-0.8.1-r3.ebuild} | 15 +++++---------- |
15 |
2 files changed, 6 insertions(+), 10 deletions(-) |
16 |
|
17 |
diff --git a/net-voip/telepathy-salut/Manifest b/net-voip/telepathy-salut/Manifest |
18 |
index 377336256ee..80560322485 100644 |
19 |
--- a/net-voip/telepathy-salut/Manifest |
20 |
+++ b/net-voip/telepathy-salut/Manifest |
21 |
@@ -1 +1,2 @@ |
22 |
+DIST telepathy-salut-0.8.1-python3.patch 5878 BLAKE2B db76eaf004418d48359c0ca710a59782fc1cda304825c75259daca41f3cd94ced207be06db7e5fd4d290b8021276077076eed330c20c2249b1577f0670697f93 SHA512 b924fae314d9efcc22226415e5904521593821996cdef9e5149ebc5ee2ceb4c2c210c311aeed3a01e634cb6ddc8f36b83d1473d700a8a6d1171c934217ef4185 |
23 |
DIST telepathy-salut-0.8.1.tar.gz 1823482 BLAKE2B 22f93d48cc749ed74ac1ee4103ea0bf5b1f93b2d14c95a4bd2edde977a5c43db5d5fe54dd246c561ee94f13b4030ab42c011f537a0e6688e8be3ac0aa0f1ca67 SHA512 34537ac9ce0b78015e184963ea79beaa7332ac11803f9683ff34577d9f0a14f7ed287aacb2c00059f2ff2f300c325a09a78a320e83d0a0031ad976da2c197a90 |
24 |
|
25 |
diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r3.ebuild |
26 |
similarity index 88% |
27 |
rename from net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild |
28 |
rename to net-voip/telepathy-salut/telepathy-salut-0.8.1-r3.ebuild |
29 |
index 910016e3338..11d873b5e9a 100644 |
30 |
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild |
31 |
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r3.ebuild |
32 |
@@ -1,14 +1,15 @@ |
33 |
# Copyright 1999-2020 Gentoo Authors |
34 |
# Distributed under the terms of the GNU General Public License v2 |
35 |
|
36 |
-EAPI=6 |
37 |
+EAPI=7 |
38 |
|
39 |
-PYTHON_COMPAT=( python2_7 ) |
40 |
+PYTHON_COMPAT=( python3_{6..9} ) |
41 |
inherit python-any-r1 |
42 |
|
43 |
DESCRIPTION="A link-local XMPP connection manager for Telepathy" |
44 |
HOMEPAGE="https://telepathy.freedesktop.org/" |
45 |
-SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz" |
46 |
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz |
47 |
+ https://src.fedoraproject.org/rpms/telepathy-salut/raw/master/f/${P}-python3.patch" |
48 |
|
49 |
LICENSE="LGPL-2.1" |
50 |
SLOT="0" |
51 |
@@ -36,7 +37,6 @@ DEPEND="${RDEPEND} |
52 |
test? ( |
53 |
>=dev-libs/check-0.9.4 |
54 |
net-libs/libgsasl |
55 |
- $(python_gen_any_dep 'dev-python/twisted[${PYTHON_USEDEP}]') |
56 |
) |
57 |
" |
58 |
# FIXME: needs xmppstream python module |
59 |
@@ -45,14 +45,9 @@ DEPEND="${RDEPEND} |
60 |
PATCHES=( |
61 |
"${FILESDIR}"/${PN}-0.5.0-uninitialized.patch # upstream bug #37701 |
62 |
"${FILESDIR}"/${P}-openssl-1.1.patch # bug #663994 |
63 |
+ "${DISTDIR}"/${P}-python3.patch |
64 |
) |
65 |
|
66 |
-python_check_deps() { |
67 |
- if use test ; then |
68 |
- has_version "dev-python/twisted[${PYTHON_USEDEP}]" |
69 |
- fi |
70 |
-} |
71 |
- |
72 |
pkg_setup() { |
73 |
python-any-r1_pkg_setup |
74 |
} |