gentoo resync : 30.09.2020

5 files changed, 21 insertions, 21 deletions

diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index a88a871c9209..08fe7a94f8d6 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
diff --git a/net-voip/telepathy-rakia/Manifest b/net-voip/telepathy-rakia/Manifest
index 2c314d686229..22062f7a059b 100644
--- a/net-voip/telepathy-rakia/Manifest
+++ b/net-voip/telepathy-rakia/Manifest
@@ -1,3 +1,4 @@
+DIST telepathy-rakia-0.8.0-py3.patch 4472 BLAKE2B 6eb45f91f351ba6ee0afa16022921efaa764168acf9a0891b57cba4ab90c5f2f3f58c7704ecc7224d9aa1a9559a6be7b96cb8ab3c5382552fe2d640ecfd94ab5 SHA512 cf76d730001da55e1bececbfab9810c83643c6b4cabc6c92c106fafae8a64d75b2eaa455599d70a0e40f13ea6d293f0621948e3a3d047d4002ce3b08b58858f0
 DIST telepathy-rakia-0.8.0.tar.gz 659116 BLAKE2B b940d28828220f83c3408aeb9effc26f17d62729f01073539ca4381604bc762b411064d6de92a557ff0f7a8a1920799163f6ede2dba6cfec01967145501a1da2 SHA512 5378e1a2909c4218cc9c6fecf0b01beff0b52fd40cc040a601090dbaae330b3506fc74dc5ae86e5f0c954dd3c41fd7ba4e5a294f8fc11d74aa6eb9025097e9ae
-EBUILD telepathy-rakia-0.8.0.ebuild 1011 BLAKE2B b6ffcf08e5ac9eb9dc6cda368b400c9e6c0a65101515bdd71ceef5d9d94eb9738493fc7099f6ddc79c8309301270656c5847d7c5ced59d38dc0f26858171573d SHA512 e86c52ec1a104a87e2076bd34069f16c97fe663d88fee0bd428dbe67ef0df1aa346402d39565afa05ca3a6b402762fee37a4c4cce4c39a8ae400f74b9facc1ae
+EBUILD telepathy-rakia-0.8.0-r1.ebuild 1066 BLAKE2B 4d4fbb6a3e359dd581b99d42931f75a340ba5995dee35ce1f4a47176be3a712f65713038a8786d3add4defe40d2913ac286bb5b0629e21c1aacf6a231031af2a SHA512 ed74182b0c1a3638e4e71cf7bd95dc5aad1c4aeb035f8d233cd88c13f9244a17d98fdf0f0eff1b64c47b11eeea14a5ba5d366344154bda075d5bd09e81370e49
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-voip/telepathy-rakia/telepathy-rakia-0.8.0.ebuild b/net-voip/telepathy-rakia/telepathy-rakia-0.8.0-r1.ebuild
index 93507fcb9416..e6a644508e34 100644
--- a/net-voip/telepathy-rakia/telepathy-rakia-0.8.0.ebuild
+++ b/net-voip/telepathy-rakia/telepathy-rakia-0.8.0-r1.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6..9} )
 
-inherit python-single-r1
+inherit python-any-r1
 
 DESCRIPTION="A SIP connection manager for Telepathy based around the Sofia-SIP library"
 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://patch-diff.githubusercontent.com/raw/TelepathyIM/telepathy-rakia/pull/1.patch
+		-> ${P}-py3.patch"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test"
 
 COMMON_DEPEND="
-	${PYTHON_DEPS}
 	>=dev-libs/dbus-glib-0.60
 	>=dev-libs/glib-2.30:2
 	>=net-libs/sofia-sip-1.12.11
@@ -31,11 +30,15 @@ RDEPEND="${COMMON_DEPEND}
 "
 # telepathy-rakia was formerly known as telepathy-sofiasip
 DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
 	dev-libs/libxslt
-	test? ( dev-python/twisted-core )
 "
 # eautoreconf requires: gtk-doc-am
 
+PATCHES=(
+	"${DISTDIR}"/${P}-py3.patch
+)
+
 src_configure() {
 	econf --disable-fatal-warnings
 }
diff --git a/net-voip/telepathy-salut/Manifest b/net-voip/telepathy-salut/Manifest
index 8940c928235a..84baa46c6edb 100644
--- a/net-voip/telepathy-salut/Manifest
+++ b/net-voip/telepathy-salut/Manifest
@@ -1,5 +1,6 @@
 AUX telepathy-salut-0.5.0-uninitialized.patch 496 BLAKE2B f697051628069c6a8c6339ddee37133eab9b90b4f43553b501c611d02de4c63c14d3e4e15896987acd6d4b275a6416a777fbbfac962f90e1dd55c10872ff3939 SHA512 a6365b18b5c1f876c990ec4bbf522b2c8708ca73c201e9bac9447e3fc8d8979b3882c977e9393e34031ca2659b0519c841645280a03d11b4bac8e907db816ce9
 AUX telepathy-salut-0.8.1-openssl-1.1.patch 7190 BLAKE2B f66a7a22ac36889aceca1ddcf8ae85438a6ae380f99f1cc068f9df34b7b6763bd773d0669b36f2ab8fc9557ce4d6ef71abd5f011f542b040114b70a909b40a15 SHA512 fa105e35ce369a35e844d7886c22d7c17433db482d0e5ac6156139ae6474dd91045cda7490d460a26adbd35f370aa98ea9c4a5ebdc81d627c022616a9de9c138
+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
-EBUILD telepathy-salut-0.8.1-r2.ebuild 1815 BLAKE2B abf34721fa6dd4f31a7f4788b9fc04332b1ab8657aec3747b0442fb3518b5e26f418dd9911962e9cc45ce1f9cc5c0a6dc4c3c99fbcacf71146c37b3e667f0505 SHA512 e9a846d7c400d30d384af2b8b780b9dca911ddbf39df600b381ba813ab3137bcbef7237a95b49c262a93e45e0d904b4a6ece5fa6949295ef6b8e3948f79e1ebb
+EBUILD telepathy-salut-0.8.1-r3.ebuild 1771 BLAKE2B e08c0062b152c96660216d9f443d226e9512eb1bde6a0b2997c659c66e2fac9ec1cf95b0697d7ad32ae6aea549b3b580add99751fdb3356590aad9be981aaf41 SHA512 61ae8443bae1f8e73e85ed29ebadda855b5fbc9c082960da78911450a1af242b97652f656bf90a343cf007d76d1e3a8f7bbb17280577e45a4ec75d98ab7bd131
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
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
index 910016e3338c..11d873b5e9a7 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
 }