gentoo Easter resync : 12.04.2020

7 files changed, 9 insertions, 22 deletions

diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index c99dfe0d7bb9..35a4f9c13193 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
diff --git a/net-voip/telepathy-gabble/Manifest b/net-voip/telepathy-gabble/Manifest
index 0f16d1f757b1..89efebfff72e 100644
--- a/net-voip/telepathy-gabble/Manifest
+++ b/net-voip/telepathy-gabble/Manifest
@@ -1,5 +1,5 @@
 AUX telepathy-gabble-0.18.4-build-fix-no-jingle.patch 774 BLAKE2B 3a861c8f32d0900003b7553f70144f261bf45f33dd2cfffb54d1a0bbc00a1f99961180d8f848d4e1cf70deee46e9a66fd56af6cc6196787fa4265bbd46034a35 SHA512 e1d2dc3b13ebfb24dab5c73ba9dd930f1ff61a443311dbfb3526a3474bfba96934b24e48c8b098216e8c205c4835143c891697c23b328a6541a72683d4864e11
 AUX telepathy-gabble-0.18.4-openssl-1.1.patch 8670 BLAKE2B 1d7f3133a67b4f17acbbbad0e1ba45421c9d3bbaa7bab4cdc1cffdadaff6a839b197f8b2167c5bb77fef80a68fea6c214fe0fb6b348c06a2a84a020d0d5f4cfe SHA512 f3d5f4aa15efe17a408888a51a5670e512cf3264261b1a11bada080b15ec131c42f222fe9fe9660717d32208988383a75214908adc6e364d4a8903b7ef0f3d2c
 DIST telepathy-gabble-0.18.4.tar.gz 2584311 BLAKE2B c1708be2ebe0b7dd06b53af1087c349e1a1f0b83dfffe463c72e31e459d2efd4db5bad7ade7a478bd4b91948aade822bfa6c13fe175863759cc98c44beca8178 SHA512 4303f1da7eeadf1f0e69fa881cd8b08dc41f4fd061df3f2ecdc80735d8be3e8cf24d8482f265f1858d8dfed71f62e8bc02c13f9525db8d21c9d927e25fa66218
-EBUILD telepathy-gabble-0.18.4-r1.ebuild 2522 BLAKE2B 2abc9b311aaf732e0a231c6999cb243ad2d70469d404d52d22dcb238be504a3108f55bb01eed6baac18a883d13669504939b3ae44ad3973a9b53220bfd3d93fe SHA512 9cd5b054e21f46e466d7f1845c210383278cc841480cce2a44959199191e756cd2c6726a1424fbb5311d8d966f16ed0c3784ab523cc5c6a2a066a25bca7ab9db
+EBUILD telepathy-gabble-0.18.4-r1.ebuild 2404 BLAKE2B 066e6fb74f51d9149a0aaddd8033722311fe40b67e407a2cf01fae4dbba3e3f9b44768556ae3948ba5a0df558a7440e0088f6b064e5149adcd0c565b7003613a SHA512 b326c2b54c7aab612e17cdb13fc70456102395106deb4ec770dbc91baf7c09e17a24e8ae59fa2b79c73dd7e3a9050f222ad8f9b9333b75d2f43b1493d94f825c
 MISC metadata.xml 372 BLAKE2B a310551b32c7bfef5ea2b2f343ec6afda74de8cd3aba90f070fe37afb44658e404dfeea1f4393846ccc917bc42c388c332e579889fd155da0bbcc2fdb0424287 SHA512 12de5cf5c137b921ce68e54f0a5eb5d3c3156b77ceae95de9c6d23a291eb21b40aaf43348ca9387f0709dd355fd5dcb774ddf7ce19e2a96beb7bf92c7586cef8
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r1.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r1.ebuild
index e4689143ead4..a41a4aefb82a 100644
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r1.ebuild
+++ b/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,12 +57,7 @@ DEPEND="${RDEPEND}
 # pygobject:2 is needed by twisted-17 for gtk2reactor usage by gabble
 #test? (
 #	dev-python/pygobject:2
-#	|| (
 #	>=dev-python/twisted-16.0.0
-#	(	>=dev-python/twisted-core-0.8.2
-#		>=dev-python/twisted-words-0.8.2
-#		>=dev-python/dbus-python-0.83
-#	) )
 #)
 
 PATCHES=(
diff --git a/net-voip/telepathy-haze/Manifest b/net-voip/telepathy-haze/Manifest
index dacad7a51157..acc3af5676e1 100644
--- a/net-voip/telepathy-haze/Manifest
+++ b/net-voip/telepathy-haze/Manifest
@@ -1,5 +1,5 @@
 AUX telepathy-haze-0.8.0-crash.patch 878 BLAKE2B 72ae78c779a3e523de8063f7b1015fc09e81bec2376c689e9e70d1a76af2c5e6d79b0ee2796a7d3a4cd7f540c828f25e00802b2d183daefbef0ea4c5ecbc346e SHA512 d771595854732754352c9b740678d9bfcaa1a34e0096b7ce51ac42b1f022ae836809f3aeefddf6bf09e03c9c742ee21c2974e6cd2e662b88ab102b280c72e468
 AUX telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch 707 BLAKE2B 2a19d0011d71363a60962704944431cd3b546c9a501e27c555050fe69a1b213e06a6fb8b6422709158a0ffbdc174cce267c2ec99cf49894251ea340f05931255 SHA512 bfe7a8a443ed832c2db33a5d69ae29e489b2f697256f4698224378aad2f103b7a4babe7c1d150c8561b47e999325065b7cdb35b1a696a67aeddf58fdbf321543
 DIST telepathy-haze-0.8.0.tar.gz 580929 BLAKE2B 08c5a10de978b9d75270ed9408612021974d8fcecff3b8613abeea09280253867957b812d4c3b500e95c5f5992a799bfc54b9497ba0f01507051f7d414cd9b14 SHA512 2739b37b1f95f0996b423c0883f369e1283363e39cb1b0566e2573f3cebdab0530ffd1d4d515202e300407029227b75b4e8c459167d584000405fda2d070699d
-EBUILD telepathy-haze-0.8.0-r2.ebuild 1473 BLAKE2B a18d26972d3aa0854185c2e7d030b26bbe1525f58cd9e043b2756170edec9b99713dd1aecbabf71e69a8a8342f0ef16448b9af1a6fb5d5f3c2968f86535d46e3 SHA512 23e74ff6cd9b58318a01bb48ee8028bfe78ab81dd1873107dc67c1e2a2f3c685675b1216491a5c77f0ff1be7f4da68303401451c1a28d3826376bbba26eedc1b
+EBUILD telepathy-haze-0.8.0-r2.ebuild 1326 BLAKE2B 3cab9da41b9e0ce8cf090ebb46c70d3a6836a7a211cbe2f3092f883aa192b767fafd0cb12e7475bd1c1b62c8c46474d01c3f49b910502b82963bb4db27418d25 SHA512 56459f5f1f98a1fd4a03326557645bd81d220a316a47c2e389adb4f1c77d09f1de0b84a1199cfacd4a3ca6c034ce4fae114c58cac49074b66be9a2946f9c6b7e
 MISC metadata.xml 397 BLAKE2B b3947cc029930857c477f18c4105ea341e979d34b2f5277d017cecf1e81c5e90a0436307e764f9f53dd7d68708c53c706d645fad2c87ff686576de37fbfb39fc SHA512 c66690b8c7673833eff4cc785e913e16c26eeaaf23bf7cc946f6022e548e24ecc0ee14a1ca14c54b9e15b301dcf25b472e5dbbc406ed614fabea9962f928c3d0
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
index 124ede37e157..3a90c52fe393 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,10 +30,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? (
 		dev-python/pygobject:2
-		|| (
-			$(python_gen_any_dep 'dev-python/twisted[${PYTHON_USEDEP}]')
-			$(python_gen_any_dep 'dev-python/twisted-words[${PYTHON_USEDEP}]')
-		)
+		$(python_gen_any_dep 'dev-python/twisted[${PYTHON_USEDEP}]')
 	)
 "
 
@@ -48,8 +45,7 @@ PATCHES=(
 
 python_check_deps() {
 	if use test ; then
-		has_version "dev-python/twisted[${PYTHON_USEDEP}]" \
-			|| has_version "dev-python/twisted-words[${PYTHON_USEDEP}]"
+		has_version "dev-python/twisted[${PYTHON_USEDEP}]"
 	fi
 }
 
diff --git a/net-voip/telepathy-salut/Manifest b/net-voip/telepathy-salut/Manifest
index 053f2bf97300..c17deefceb96 100644
--- a/net-voip/telepathy-salut/Manifest
+++ b/net-voip/telepathy-salut/Manifest
@@ -1,5 +1,5 @@
 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.tar.gz 1823482 BLAKE2B 22f93d48cc749ed74ac1ee4103ea0bf5b1f93b2d14c95a4bd2edde977a5c43db5d5fe54dd246c561ee94f13b4030ab42c011f537a0e6688e8be3ac0aa0f1ca67 SHA512 34537ac9ce0b78015e184963ea79beaa7332ac11803f9683ff34577d9f0a14f7ed287aacb2c00059f2ff2f300c325a09a78a320e83d0a0031ad976da2c197a90
-EBUILD telepathy-salut-0.8.1-r2.ebuild 1962 BLAKE2B a3d4bcf8fc0ac92ac8e4cbecbe687eb9c373bdb4a772f742a5ac7a29ae00c20fe9c05dc8e7e0e69b771a3466864ff268acc67027a6379560f5b18a602e338c60 SHA512 76b2f039c060781ae60cbcd664afd23055e260bf7180e38ea9fe3226d7f55b80449f9095a391271683e43ea684f2b9f9a3dafdf2fe26f6cf91e9152355dcd245
+EBUILD telepathy-salut-0.8.1-r2.ebuild 1815 BLAKE2B abf34721fa6dd4f31a7f4788b9fc04332b1ab8657aec3747b0442fb3518b5e26f418dd9911962e9cc45ce1f9cc5c0a6dc4c3c99fbcacf71146c37b3e667f0505 SHA512 e9a846d7c400d30d384af2b8b780b9dca911ddbf39df600b381ba813ab3137bcbef7237a95b49c262a93e45e0d904b4a6ece5fa6949295ef6b8e3948f79e1ebb
 MISC metadata.xml 356 BLAKE2B b6957f8ef7ce454117fb23e0697db6e670bf345ce62d1e62387d68cc2f4f59947e7599374a13f6fa370f73ac01476ad414ce15ab33962d2a9320c1d14bc76c13 SHA512 6fd05632d1a64a09fa14a2e32738df4c2fd7e0a4e264762a14f2fc3d857dab056365b1780625bc5248d4920e08ed4284a33d76bf265991286f47643b5c69c348
diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
index 3f568babb3e9..910016e3338c 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
@@ -36,10 +36,7 @@ DEPEND="${RDEPEND}
 	test? (
 		>=dev-libs/check-0.9.4
 		net-libs/libgsasl
-		|| (
-			$(python_gen_any_dep 'dev-python/twisted[${PYTHON_USEDEP}]')
-			$(python_gen_any_dep 'dev-python/twisted-words[${PYTHON_USEDEP}]')
-		)
+		$(python_gen_any_dep 'dev-python/twisted[${PYTHON_USEDEP}]')
 	)
 "
 # FIXME: needs xmppstream python module
@@ -52,8 +49,7 @@ PATCHES=(
 
 python_check_deps() {
 	if use test ; then
-		 has_version "dev-python/twisted[${PYTHON_USEDEP}]" \
-			|| has_version "dev-python/twisted-words[${PYTHON_USEDEP}]"
+		 has_version "dev-python/twisted[${PYTHON_USEDEP}]"
 	fi
 }