[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-salut/

["Michał Górny" <mgorny@gentoo.org>]

commit:     bb0ee0073efe96e5bf0ae44507c5add30550c891
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 27 04:31:37 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 06:17:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb0ee007

net-voip/telepathy-salut: Port to py3

Closes: https://bugs.gentoo.org/735436
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-voip/telepathy-salut/Manifest                         |  1 +
 ...ut-0.8.1-r2.ebuild => telepathy-salut-0.8.1-r3.ebuild} | 15 +++++----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/net-voip/telepathy-salut/Manifest b/net-voip/telepathy-salut/Manifest
index 377336256ee..80560322485 100644
--- a/net-voip/telepathy-salut/Manifest
+++ b/net-voip/telepathy-salut/Manifest
@@ -1 +1,2 @@
+DIST telepathy-salut-0.8.1-python3.patch 5878 BLAKE2B db76eaf004418d48359c0ca710a59782fc1cda304825c75259daca41f3cd94ced207be06db7e5fd4d290b8021276077076eed330c20c2249b1577f0670697f93 SHA512 b924fae314d9efcc22226415e5904521593821996cdef9e5149ebc5ee2ceb4c2c210c311aeed3a01e634cb6ddc8f36b83d1473d700a8a6d1171c934217ef4185
 DIST telepathy-salut-0.8.1.tar.gz 1823482 BLAKE2B 22f93d48cc749ed74ac1ee4103ea0bf5b1f93b2d14c95a4bd2edde977a5c43db5d5fe54dd246c561ee94f13b4030ab42c011f537a0e6688e8be3ac0aa0f1ca67 SHA512 34537ac9ce0b78015e184963ea79beaa7332ac11803f9683ff34577d9f0a14f7ed287aacb2c00059f2ff2f300c325a09a78a320e83d0a0031ad976da2c197a90

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
similarity index 88%
rename from net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
rename to net-voip/telepathy-salut/telepathy-salut-0.8.1-r3.ebuild
index 910016e3338..11d873b5e9a 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r3.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit python-any-r1
 
 DESCRIPTION="A link-local XMPP connection manager for Telepathy"
 HOMEPAGE="https://telepathy.freedesktop.org/"
-SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz
+	https://src.fedoraproject.org/rpms/telepathy-salut/raw/master/f/${P}-python3.patch"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -36,7 +37,6 @@ DEPEND="${RDEPEND}
 	test? (
 		>=dev-libs/check-0.9.4
 		net-libs/libgsasl
-		$(python_gen_any_dep 'dev-python/twisted[${PYTHON_USEDEP}]')
 	)
 "
 # FIXME: needs xmppstream python module
@@ -45,14 +45,9 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.5.0-uninitialized.patch # upstream bug #37701
 	"${FILESDIR}"/${P}-openssl-1.1.patch # bug #663994
+	"${DISTDIR}"/${P}-python3.patch
 )
 
-python_check_deps() {
-	if use test ; then
-		 has_version "dev-python/twisted[${PYTHON_USEDEP}]"
-	fi
-}
-
 pkg_setup() {
 	python-any-r1_pkg_setup
 }