gentoo resync : 03.11.2019

4 files changed, 3 insertions, 45 deletions

diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index 0d91d36ad2b9..acf745db7990 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
diff --git a/net-voip/telepathy-haze/Manifest b/net-voip/telepathy-haze/Manifest
index 6b5cd7153a63..28f438ee0b6d 100644
--- a/net-voip/telepathy-haze/Manifest
+++ b/net-voip/telepathy-haze/Manifest
@@ -1,6 +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-r1.ebuild 1158 BLAKE2B 4ac9c7b6ace22be82d467556eb3d1d91c84a49ba8d6078de2446168103610d158dc368a9b98089bb389e3e3b6b33a916ed092fb645eeb659539bed235b6de266 SHA512 d70d5c8542e108f2dd4dec89a8a974bc739ecdb072243d509eeda638b06f4e9c174f585c4c22ac47187ffb54e234eb051836802f86f154efb571cc857ced4b7d
-EBUILD telepathy-haze-0.8.0-r2.ebuild 1422 BLAKE2B 82be3258553cb5ade4b30a498cc1ef18dc57a738bb5c91141c099d5f6f947af193b59b1b7262a12acaebf1a0d9007e4e1f4e65c9be3622a34b988bc86427baea SHA512 48eb96b5dcbe9ac54e0e6860da6d4d5c2714df6f305047f577f3f30f821eee1d4f210b8be9b971de8945d1c96290fa825d5403faa3ca625887801fc3f3903c1c
+EBUILD telepathy-haze-0.8.0-r2.ebuild 1446 BLAKE2B c79daf973f10a8bed48bfb1cf8df5b1ec810a4a99f3e478e26a2de9ee70084353cc135f7b7b5e9891c2514d7d1a2812c3ab81e9949ec2012e5ec87882a3bc556 SHA512 34e1f2639989068e6b4dfc5ed4e1f5caf4d3f6d94bb7d326f6cea9f8f0760aa7ea86fc2e1a5e5a712db9173f28dfabbc9d33d734f9b9a3f1eaa6c8ab4122278b
 MISC metadata.xml 397 BLAKE2B b3947cc029930857c477f18c4105ea341e979d34b2f5277d017cecf1e81c5e90a0436307e764f9f53dd7d68708c53c706d645fad2c87ff686576de37fbfb39fc SHA512 c66690b8c7673833eff4cc785e913e16c26eeaaf23bf7cc946f6022e548e24ecc0ee14a1ca14c54b9e15b301dcf25b472e5dbbc406ed614fabea9962f928c3d0
diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
deleted file mode 100644
index ccf350d7d57b..000000000000
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-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 ~ia64 ~ppc ~ppc64 ~sparc x86"
-#IUSE="test"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Tests failing, see upstream: https://bugs.freedesktop.org/34577
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	>=net-im/pidgin-2.7
-	>=net-libs/telepathy-glib-0.15.1[${PYTHON_USEDEP}]
-	>=dev-libs/glib-2.30:2
-	>=dev-libs/dbus-glib-0.73
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	virtual/pkgconfig"
-#	test? ( dev-python/twisted-words )"
-
-src_prepare() {
-	# contact-list: Don't crash if a contact is already in the roster
-	# (fixed in next version)
-	epatch "${FILESDIR}"/${P}-crash.patch
-
-	# Fix compat with newer pidgin versions, bug #572296
-	epatch "${FILESDIR}"/${P}-pidgin-2.10.12-compat.patch
-}
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 04e3191f428a..b29a0717c19a 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
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	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}]')