gentoo resync : 10.02.2020

33 files changed, 760 insertions, 458 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 2b26898a87f8..17b5aeff3f9d 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
index f7d89f000a11..acc45bfbf89e 100644
--- a/net-im/choqok/Manifest
+++ b/net-im/choqok/Manifest
@@ -1,4 +1,6 @@
 AUX choqok-1.6.0_p20190726-missing-header.patch 2633 BLAKE2B 337a69d5addaf10e55cda74d40f0ebf7e768be12cf9b9315a29b622fddb5e2ae0ade9107907b8be495ab285f8cc94bb556c1103191b884620e4469f9ec43c390 SHA512 31b87f27d697afabbc41516715e35b5c28a884db454275c22cc5014af965bcd8ba5faac7ef029754a9c706052972fac39df6e4320f346e450bb808a2f409932c
 DIST choqok-1.6.0_p20190726.tar.xz 1184148 BLAKE2B c0c0459de362aa58337ab2d0c4ea03ff516de87bded48f73c47aa48ed791cfeb82c4085c4d333bff4ac1489a27e038da29d5419569aacb17366dc119e776dd67 SHA512 6471d9b37cc78fd3a14cc970512db3a8d44b21d49efb503917a57332f229c34ed735edfea6a74d6c25d8ab8d153331226effd677405d447c4a2faea3e396decf
+DIST choqok-1.7.0.tar.xz 1202092 BLAKE2B 62e0c561579c36198f645bb550822d9bec583d8337b37e3336e4352199800b1807b80931f8c7c8141f74dfb91ade9f89b371723a8a3ea3e7bde97854634b82b2 SHA512 6f5998078e555f7b4a40270ad0a4defa2d15bb8440b810320fc4cfc38d78cb34bb9b2f6a38eb33eb3217b51a78a7fbc7f79224cd0ddb0fcbf8c9035d8e600e96
 EBUILD choqok-1.6.0_p20190726.ebuild 1983 BLAKE2B 9d5a949f3c6016c414b490ab99f44c27e5b3e4f1c0cf3beee786e652c0c20e0b249ccb7b96069bd3514e6beee748d0df322c1b1fdd8bf6ca33fb72ffe15c20ad SHA512 502c690d6408f2c5eca575f2dab37c7537248e536b686fead44c3b0b2ec5f7e625436e87b673e530728bcd58b44ea8edc974de9874993fa3966888d83cb95a48
-MISC metadata.xml 534 BLAKE2B 641e9a82e273a88f4ad7babec0ed86995e0a40a08a3b41207fb2139991857d6cb14392070cb7e81b89116b9e0cbc6a1fc7c2a4a4a9bd2e2a0d11489dc6ea03e9 SHA512 57e46f814444e2072218a78f3a668d50f8cc6f2e67a7c4560c9d06e03f6846c462186199b83dd008ca06c419e8c7b42654dec6cc782e19af188812b9020301bd
+EBUILD choqok-1.7.0.ebuild 2211 BLAKE2B 67536efba6f6d9b50e702a8ba67a9529355b823710865c7cde5559425d0a86d51aec3fab4810f6f8d53998ccfef3eea8929cf6f9af36ec020dd909fe1738aa6f SHA512 f91ed01d97b3bb62da2ea93a2fd068d6d34c1ff6c04cdf8906d3b416fe5faa46830d95b74f686d483ae36dda44da227c1b94b1f85032c3d8db7002f515645f9a
+MISC metadata.xml 634 BLAKE2B 30e3ee2973d1de819dba64ce8f5029627248786d73d13a6203d24c9714cd160481b7170c04a4d7e78c2e1d9a2061b4b952938be2df31b3883fabe2323a2a9154 SHA512 fae64251578632ac8f3f74f2a75b30b2e470aaab9103a5a92978681f8194ecd65f8d2162800ede82b7f2574bb1a5142de8bd68db2e383342ec1ac958e39dd599
diff --git a/net-im/choqok/choqok-1.7.0.ebuild b/net-im/choqok/choqok-1.7.0.ebuild
new file mode 100644
index 000000000000..a6a4bf140c46
--- /dev/null
+++ b/net-im/choqok/choqok-1.7.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Free/Open Source micro-blogging client by KDE"
+HOMEPAGE="https://choqok.kde.org/
+https://kde.org/applications/internet/org.kde.choqok"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="5"
+IUSE="attica konqueror share telepathy"
+
+DEPEND="
+	app-crypt/qca[qt5(+)]
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetworkauth-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kemoticons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	attica? ( >=kde-frameworks/attica-${KFMIN}:5 )
+	konqueror? (
+		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
+		>=kde-frameworks/kparts-${KFMIN}:5
+		>=kde-frameworks/kdewebkit-${KFMIN}:5
+	)
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	telepathy? ( net-libs/telepathy-qt[qt5(+)] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS README changelog )
+
+src_prepare() {
+	ecm_src_prepare
+	# TODO: quick fix for bug #708464
+	sed -e "/find_package.*Purpose)/s/ COMPONENTS //" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package attica KF5Attica)
+		$(cmake_use_find_package konqueror KF5Parts)
+		$(cmake_use_find_package konqueror KF5WebKit)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package telepathy TelepathyQt5)
+	)
+
+	ecm_src_configure
+}
diff --git a/net-im/choqok/metadata.xml b/net-im/choqok/metadata.xml
index fd48455d9707..7606fdaab74d 100644
--- a/net-im/choqok/metadata.xml
+++ b/net-im/choqok/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="attica">Build Open Collaboration Services plugin using <pkg>kde-frameworks/attica</pkg></flag>
 		<flag name="konqueror">Build Konqueror Choqok plugin</flag>
+		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
 		<flag name="telepathy">Enable support for the real-time communication framework telepathy</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 11ffb6f12b05..623c27467f69 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,3 +1,3 @@
 DIST empathy-3.12.14.tar.xz 5017776 BLAKE2B 15f4c71a4f40988afd51d0665ee24164fb7e1d14994e577c23fa29a995503e78f8b784d26edd90503f9825c64dc814f07860aa6792eec6948c566dc3ff669dad SHA512 f467277278a9e8d330e4ab656b3edb2acac6efec211baa146a5ea0a6d0da299e68cdb83ceb1a27a1aa4744c2ce1a441fa287001003c523036ada517029a40123
-EBUILD empathy-3.12.14.ebuild 3021 BLAKE2B b8559474a42bcbe19c62d3291416608f218ecf7d0910503de57a65101fbdeb3dc536e62e102afa9f4e58967ccc49ab99622b733a0d946f193566ebcc61a830fc SHA512 f184726f6634126b5bcd2f8ccbb8f8a70b311d3bee44d4ef3f7aaa138b2d2569adca3d80402250ec0cee4f1f6c4a540866035665a1db94c373b038dfff56c747
+EBUILD empathy-3.12.14.ebuild 3015 BLAKE2B 886e723b2775df129cac768f6b69f26803638caacbe30a5d515c80270b04b3672a35b2c13a6fc51f7b3df03a887f3f9431476599ef4bad2cbe6ec1a47a262ca4 SHA512 91a79a5a2a7461d41ddee8c70624ffed7e70a76a49877af54902f467e34566f2a9587ab06c6f0fe85e4f2c39f037df9282be37d0eb6dbd6b73fa764ef12fd663
 MISC metadata.xml 946 BLAKE2B b31b1cd6a21a89f6b9250cbe68465ddb9abdc524ffa16d232813b4bca917edf03c2b4690dcfdedc5ea281738ceb638a3f975064527d53e3fe87a7ca190bf43bc SHA512 98f60d8d61b6fe772c334bd4a0890aefb105231b1ee6adb8dccc20962334fbf95c229aafba68a8ff500cf067bae20b7049fbe2c0023c4abdabcafeb86b130d83
diff --git a/net-im/empathy/empathy-3.12.14.ebuild b/net-im/empathy/empathy-3.12.14.ebuild
index 3d417c69b798..c17003cc09c7 100644
--- a/net-im/empathy/empathy-3.12.14.ebuild
+++ b/net-im/empathy/empathy-3.12.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit gnome2 python-any-r1 virtualx
 
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 72af109b6290..dd9f0bebd211 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,6 +1,6 @@
 DIST gajim-1.0.3.tar.bz2 5964743 BLAKE2B af4bf2206a962eb68c4df09359fa3a0ccaca1e886d4fad67d9839f5fd4c1fd359c7ee7933d39d8c1ae7dcbde6b72548fef3564a467653064d4d37aa1db234c04 SHA512 a6d7f92a22a9dddc8a4b07eda0aae0b6fb4db57c73133ee19937f7e2a2a82c5351051d1f3627c94a44434276ed001b83d375f708f177962125af66cda8579ec8
 DIST gajim-1.1.3.tar.bz2 8013585 BLAKE2B 7be25380ecfe76ae5e2a7534665688dcca9ff850c12c7a450e8d1f6caab1820a1022750710df0a8a7ae259c5748f55582b272ad83fbdb0560f18e6ab8642bf78 SHA512 18062832f9b9295c7a844c347d5ece4a6db43126d5b58bbf362fdf2f8e082e2241c46dae6d1cbe66ebf2ef19f65618102c3c21fa0079a96fc21511e6e93420ac
-EBUILD gajim-1.0.3-r1.ebuild 2144 BLAKE2B 96526a872dfdf0da069d31714b3f3563ea7eb4fc82143e6484aba6ed2196c2b56027d75b81cbcff24b6e99404663c4e04e0a854731092649983063f9e836bea9 SHA512 80c3e7d67336edff836df80088122a06629fa6353421098888779622d03a11dcf834fb3d0ac4f1c43aa32181615bce4da4d704e44c29c2173ac3535df62e2a7b
-EBUILD gajim-1.0.3.ebuild 2142 BLAKE2B e9adbd2e1092742878059906d547cef5ccde6fea5ec1cf84b2b55392bc29925c570c1ebfafb5db6aada517365b916e9070dc9cbd5597f5b35df733a1929f181c SHA512 56727440e708e2f72fabc0b18ac57b25f117f448bb52a4e53d3ab597a4df96ee7a19f965d28043524e809bdae40962e43c10d976bbcc8196c7811904321a325f
-EBUILD gajim-1.1.3.ebuild 2294 BLAKE2B cdb31c76747fd9362a25e51c136c5a4b8d143d083f315e42fa4d43f4f8a4c9ce839743aa28a2ac5b9adb94ef3b658983dedfed653229829c01adf5b21916ae98 SHA512 03a81f04f9313574f984b4739eb1fff41449fd957ba187702ebe22c548a01212c7a84e7e94b4d8583252688323f0f6a5b4718b453a27aa7d40feb2dfed616cf1
+EBUILD gajim-1.0.3-r2.ebuild 2292 BLAKE2B 83dcdcbb109d40b63725336cd82607b05afa912e95b4a0a785022857b655aa61da11bdc77d4370c24c69601777183b791202a8b0fd6e72ea26c470dae1f385ac SHA512 223a08ff376af581392009b3df406250421a7d8d9e68cbf1a6f7cab6cea812e8d733df17e7c827bf5a4d1fd4780db7f60a74e08f0c352cb36aefc22b8bbbe4eb
+EBUILD gajim-1.0.3-r3.ebuild 2294 BLAKE2B 529ddf84890ccce47b78052242d1e5dc16c4ce7c4981b989a2b1616d88a3f14204864a36459b0def235601d6fdac1dc631c7accaf87f3e7247b3dc4a224124bc SHA512 c1006d95779082fcd88f0466a423fc9bd67897e3f2bf08cac610848e0993cc61ff297d263a5ba866a3f82d1af35ab68f3d911260c6617318cf636206288f461a
+EBUILD gajim-1.1.3-r1.ebuild 2456 BLAKE2B 969f60dd05c79e216452a23086268d37f190aabd854d50853633848f4623e27562b080e68e46a6c0955d5859347ad9ddf37ad812e50ba1a59b10efe25c08bbec SHA512 c744cce5c772f2fd144ced05be7dffeaf33b7a3c7a4a4e719335f5efeb1ab8c38a2dddfdaeb2bbea6cb0e8fa2e37476939b8a39cd14b0f0ac5cc04155d0eea25
 MISC metadata.xml 1061 BLAKE2B d7e37cec9e291addde0d1c18b155afdadee1225270c7f34f8a916f45ad828353f677f87e6de49994ba14af8cc4773689d7f629f991326e94a43ff36fa9c9b981 SHA512 f9eb4f8a033ca5cca7a2de4a43e98346cf446a20a9257ea95b37d9a6be6051224d55b32272167946c2cbef370cd3c1ddc3b27ce6b8794823d1e9ca9b5ebcac44
diff --git a/net-im/gajim/gajim-1.0.3-r1.ebuild b/net-im/gajim/gajim-1.0.3-r1.ebuild
deleted file mode 100644
index e8d7bd3df207..000000000000
--- a/net-im/gajim/gajim-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2-utils distutils-r1 versionator xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://www.gajim.org/"
-SRC_URI="https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-KEYWORDS="~amd64 ~x86"
-IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
-	+webp"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/precis-i18n[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/pygobject[cairo,${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.6.6[${PYTHON_USEDEP}]
-	x11-libs/libXScrnSaver
-	crypt? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-	geolocation? ( app-misc/geoclue[introspection] )
-	jingle? (
-		net-libs/farstream:0.2[introspection]
-		media-libs/gstreamer:1.0[introspection]
-		media-libs/gst-plugins-base:1.0[introspection]
-		media-libs/gst-plugins-ugly:1.0
-	)
-	keyring? (
-		app-crypt/libsecret[crypt,introspection]
-		dev-python/keyring[${PYTHON_USEDEP}]
-	)
-	networkmanager? ( net-misc/networkmanager[introspection] )
-	remote? (
-		>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-		sys-apps/dbus[X]
-	)
-	rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	spell? (
-		app-text/gspell[introspection]
-		app-text/hunspell
-	)
-	upnp? ( net-libs/gupnp-igd[introspection] )
-	webp? ( dev-python/pillow[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.0.3-r2.ebuild b/net-im/gajim/gajim-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..5fc452242c2e
--- /dev/null
+++ b/net-im/gajim/gajim-1.0.3-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2-utils distutils-r1 versionator xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://www.gajim.org/"
+SRC_URI="https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 x86"
+IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
+	+webp"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection[cairo]
+	>=x11-libs/gtk+-3.22:3[introspection]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/idna[${PYTHON_MULTI_USEDEP}]
+		dev-python/precis-i18n[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyasn1[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyopenssl-0.14[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-nbxmpp-0.6.6[${PYTHON_MULTI_USEDEP}]
+		x11-libs/libXScrnSaver
+		crypt? (
+			dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/python-gnupg-0.4.0[${PYTHON_MULTI_USEDEP}] )
+		geolocation? ( app-misc/geoclue[introspection] )
+		jingle? (
+			net-libs/farstream:0.2[introspection]
+			media-libs/gstreamer:1.0[introspection]
+			media-libs/gst-plugins-base:1.0[introspection]
+			media-libs/gst-plugins-ugly:1.0
+		)
+		keyring? (
+			app-crypt/libsecret[crypt,introspection]
+			dev-python/keyring[${PYTHON_MULTI_USEDEP}]
+		)
+		networkmanager? ( net-misc/networkmanager[introspection] )
+		remote? (
+			>=dev-python/dbus-python-1.2.0[${PYTHON_MULTI_USEDEP}]
+			sys-apps/dbus[X]
+		)
+		rst? ( dev-python/docutils[${PYTHON_MULTI_USEDEP}] )
+		spell? (
+			app-text/gspell[introspection]
+			app-text/hunspell
+		)
+		upnp? ( net-libs/gupnp-igd[introspection] )
+		webp? ( dev-python/pillow[${PYTHON_MULTI_USEDEP}] )
+	')"
+
+RESTRICT="test"
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-im/gajim/gajim-1.0.3-r3.ebuild b/net-im/gajim/gajim-1.0.3-r3.ebuild
new file mode 100644
index 000000000000..619619a80874
--- /dev/null
+++ b/net-im/gajim/gajim-1.0.3-r3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2-utils distutils-r1 versionator xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://www.gajim.org/"
+SRC_URI="https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
+IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
+	+webp"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection[cairo]
+	>=x11-libs/gtk+-3.22:3[introspection]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/idna[${PYTHON_MULTI_USEDEP}]
+		dev-python/precis-i18n[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyasn1[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyopenssl-0.14[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-nbxmpp-0.6.6[${PYTHON_MULTI_USEDEP}]
+		x11-libs/libXScrnSaver
+		crypt? (
+			dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/python-gnupg-0.4.0[${PYTHON_MULTI_USEDEP}] )
+		geolocation? ( app-misc/geoclue[introspection] )
+		jingle? (
+			net-libs/farstream:0.2[introspection]
+			media-libs/gstreamer:1.0[introspection]
+			media-libs/gst-plugins-base:1.0[introspection]
+			media-libs/gst-plugins-ugly:1.0
+		)
+		keyring? (
+			app-crypt/libsecret[crypt,introspection]
+			dev-python/keyring[${PYTHON_MULTI_USEDEP}]
+		)
+		networkmanager? ( net-misc/networkmanager[introspection] )
+		remote? (
+			>=dev-python/dbus-python-1.2.0[${PYTHON_MULTI_USEDEP}]
+			sys-apps/dbus[X]
+		)
+		rst? ( dev-python/docutils[${PYTHON_MULTI_USEDEP}] )
+		spell? (
+			app-text/gspell[introspection]
+			app-text/hunspell
+		)
+		upnp? ( net-libs/gupnp-igd[introspection] )
+		webp? ( dev-python/pillow[${PYTHON_MULTI_USEDEP}] )
+	')"
+
+RESTRICT="test"
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-im/gajim/gajim-1.0.3.ebuild b/net-im/gajim/gajim-1.0.3.ebuild
deleted file mode 100644
index 373bb4d2f1ae..000000000000
--- a/net-im/gajim/gajim-1.0.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2-utils distutils-r1 versionator xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://www.gajim.org/"
-SRC_URI="https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-KEYWORDS="amd64 x86"
-IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
-	+webp"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/precis-i18n[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/pygobject[cairo,${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.6.6[${PYTHON_USEDEP}]
-	x11-libs/libXScrnSaver
-	crypt? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-	geolocation? ( app-misc/geoclue[introspection] )
-	jingle? (
-		net-libs/farstream:0.2[introspection]
-		media-libs/gstreamer:1.0[introspection]
-		media-libs/gst-plugins-base:1.0[introspection]
-		media-libs/gst-plugins-ugly:1.0
-	)
-	keyring? (
-		app-crypt/libsecret[crypt,introspection]
-		dev-python/keyring[${PYTHON_USEDEP}]
-	)
-	networkmanager? ( net-misc/networkmanager[introspection] )
-	remote? (
-		>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-		sys-apps/dbus[X]
-	)
-	rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	spell? (
-		app-text/gspell[introspection]
-		app-text/hunspell
-	)
-	upnp? ( net-libs/gupnp-igd[introspection] )
-	webp? ( dev-python/pillow[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.1.3-r1.ebuild b/net-im/gajim/gajim-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..60aa6556145d
--- /dev/null
+++ b/net-im/gajim/gajim-1.1.3-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://www.gajim.org/"
+SRC_URI="https://www.gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
+IUSE="+crypt geolocation jingle networkmanager remote rst +spell upnp
+	+webp"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection[cairo]
+	>=x11-libs/gtk+-3.22:3[introspection]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/idna[${PYTHON_MULTI_USEDEP}]
+		dev-python/precis-i18n[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyasn1[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyopenssl-0.14[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-nbxmpp-0.6.9[${PYTHON_MULTI_USEDEP}]
+		x11-libs/libXScrnSaver
+		app-crypt/libsecret[crypt,introspection]
+		dev-python/keyring[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/secretstorage-3.1.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/cssutils-1.0.2[${PYTHON_MULTI_USEDEP}]
+		crypt? (
+			dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/python-gnupg-0.4.0[${PYTHON_MULTI_USEDEP}] )
+		geolocation? ( app-misc/geoclue[introspection] )
+		jingle? (
+			net-libs/farstream:0.2[introspection]
+			media-libs/gstreamer:1.0[introspection]
+			media-libs/gst-plugins-base:1.0[introspection]
+			media-libs/gst-plugins-ugly:1.0
+		)
+		networkmanager? ( net-misc/networkmanager[introspection] )
+		remote? (
+			>=dev-python/dbus-python-1.2.0[${PYTHON_MULTI_USEDEP}]
+			sys-apps/dbus[X]
+		)
+		rst? ( dev-python/docutils[${PYTHON_MULTI_USEDEP}] )
+		spell? (
+			app-text/gspell[introspection]
+			app-text/hunspell
+		)
+		upnp? ( net-libs/gupnp-igd[introspection] )
+		webp? ( dev-python/pillow[${PYTHON_MULTI_USEDEP}] )
+	')"
+
+RESTRICT="test"
+
+src_install() {
+	distutils-r1_src_install
+
+	# avoid precompressed man pages
+	rm -r "${D}/usr/share/man"
+	doman data/*.1
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-im/gajim/gajim-1.1.3.ebuild b/net-im/gajim/gajim-1.1.3.ebuild
deleted file mode 100644
index e8d0781880c4..000000000000
--- a/net-im/gajim/gajim-1.1.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://www.gajim.org/"
-SRC_URI="https://www.gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-KEYWORDS="~amd64 ~x86"
-IUSE="+crypt geolocation jingle networkmanager remote rst +spell upnp
-	+webp"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/precis-i18n[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/pygobject[cairo,${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.6.9[${PYTHON_USEDEP}]
-	x11-libs/libXScrnSaver
-	app-crypt/libsecret[crypt,introspection]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/cssutils-1.0.2[${PYTHON_USEDEP}]
-	crypt? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-	geolocation? ( app-misc/geoclue[introspection] )
-	jingle? (
-		net-libs/farstream:0.2[introspection]
-		media-libs/gstreamer:1.0[introspection]
-		media-libs/gst-plugins-base:1.0[introspection]
-		media-libs/gst-plugins-ugly:1.0
-	)
-	networkmanager? ( net-misc/networkmanager[introspection] )
-	remote? (
-		>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-		sys-apps/dbus[X]
-	)
-	rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	spell? (
-		app-text/gspell[introspection]
-		app-text/hunspell
-	)
-	upnp? ( net-libs/gupnp-igd[introspection] )
-	webp? ( dev-python/pillow[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-src_install() {
-	distutils-r1_src_install
-
-	# avoid precompressed man pages
-	rm -r "${D}/usr/share/man"
-	doman data/*.1
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/jabber-base/Manifest b/net-im/jabber-base/Manifest
index ccc96fd0f348..9d7f6c172af8 100644
--- a/net-im/jabber-base/Manifest
+++ b/net-im/jabber-base/Manifest
@@ -1,2 +1,2 @@
-EBUILD jabber-base-0.01-r1.ebuild 1506 BLAKE2B 1c94506530ae4b7d8cd4c0b3a98c74c6c44504e1f5053472f742ac3561884dd91dddd8d8ab32660dc07023737b10b5de031c0a15df906a7cb5593b214ed176d3 SHA512 2678a39e9252662c4da114f931f74a881d54df36a310cad3724b53e61938151452067b247d7ede65f42a78409657f728930910e012299e9d6efaed74d25d2404
+EBUILD jabber-base-0.01-r1.ebuild 1523 BLAKE2B a49560bc75bad0fccd968e1291d48de852af5983ec7eaeba4d5d680c7358418d9d43383f87154d4d463c30169cea9e45e77d8715cbd3fd1ff6b070ae0da01cea SHA512 9dbc8ba9b57c21e739f1509e13a510bf9dd4043b53e9b5de5c8d1965b9881cbfb82510a7d70b18ec3223690e0c0e669d9a4894183122af2107ef35188d9d695a
 MISC metadata.xml 363 BLAKE2B d39b7cb71af89d54bcd663508abec175512058c81d0ecc11cbcf76455e40dbf36c5641bf943266e8f7ce0a7f6bb5807f0fbfe78a2d04054178bf99c15dc1060a SHA512 44bd244e6521f2132804357972d71f92e704471a42828f41b334966d02509c948674aaf20f7c61ff33c2432467cd6b021c30a27bcd851fdedcc7f353903f8462
diff --git a/net-im/jabber-base/jabber-base-0.01-r1.ebuild b/net-im/jabber-base/jabber-base-0.01-r1.ebuild
index dd01753c31d9..274369f36c74 100644
--- a/net-im/jabber-base/jabber-base-0.01-r1.ebuild
+++ b/net-im/jabber-base/jabber-base-0.01-r1.ebuild
@@ -7,7 +7,7 @@ inherit eutils user
 
 DESCRIPTION="Jabber servers and transports layout package"
 SRC_URI=""
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 6be5584bf9cd..b36360c10dea 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -7,5 +7,5 @@ AUX pidgin-2.13.0-python3_support.patch 1156 BLAKE2B be31ac0d0ab07588d2ae635f066
 DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
 DIST pidgin-2.13.0.tar.bz2 8994457 BLAKE2B 32be31509a90b924fba4a4dbaba304580d88dfc6d3bbe0c88ef12eef381f70e031af1a55ada2abfb6968a9967a9fdadfa69973482b80dea7bb554a983a96fa12 SHA512 68b3d1eefee111544c7eb347386d0aea4f47c3e320d5963a4e0d833ed6af7b1be243a7bcd6a38c9234b58601d10a9aebf8541f1d97decfeca754fa78dc693047
 DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
-EBUILD pidgin-2.13.0-r4.ebuild 7762 BLAKE2B e60e504340b162e250d7c819aca63fee1838683eedc7a1ece7d35c3cda9f5e76ceedaa0f7c564007152a9b759c7dd81034a8b996f3653cbf208f1de339378fca SHA512 7aab6dc7051728e12674cfa525a3aa2571a96a8ad609cc857c755bb3f41bb23d66efb02ff19941bde139628cf70ee2b506900d8e9b64e83165fd0dc7fa9c782c
+EBUILD pidgin-2.13.0-r5.ebuild 7801 BLAKE2B b4734f51179dcfb60b5faf5d1305317f43efcbd4e7ef699ca41a6cd6f627cda9ae3e80f397194e3b76488c967723b1666dac0da699ee82edb0423bb043109115 SHA512 b4119884ad72dd99af7eab62a15f576630662888f98327ae67c8e0e99ee9a1125d3e63bc7a263d1070712a6a1edc6545ea2d309ad180d0d4a570141d8f738ca8
 MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7
diff --git a/net-im/pidgin/pidgin-2.13.0-r4.ebuild b/net-im/pidgin/pidgin-2.13.0-r5.ebuild
index ce37abd415e1..b6fa6ecd0772 100644
--- a/net-im/pidgin/pidgin-2.13.0-r4.ebuild
+++ b/net-im/pidgin/pidgin-2.13.0-r5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
 meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
 tk +xscreensaver zephyr zeroconf" # mono
@@ -54,7 +54,9 @@ RDEPEND="
 	dbus? (
 		>=dev-libs/dbus-glib-0.71
 		>=sys-apps/dbus-0.90
-		dev-python/dbus-python[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	perl? ( >=dev-lang/perl-5.16:= )
 	gadu? ( || (
diff --git a/net-im/pyicq-t/Manifest b/net-im/pyicq-t/Manifest
index 90402cadc096..4610d322e2b4 100644
--- a/net-im/pyicq-t/Manifest
+++ b/net-im/pyicq-t/Manifest
@@ -3,5 +3,5 @@ AUX pyicq-t-0.8.1.5-pillow-imaging.patch 1236 BLAKE2B f394b84f530fc01ddc87ec3e9f
 AUX pyicq-t-0.8.1.5-python26-warnings.diff 3485 BLAKE2B edf98d20ea41bed32b3c4952c24f133a6d02a073402d0032140195fc9772eb85421ed202a72813922f61001d4c56e34fee38cc49701e646e1992961cb8e0f3ed SHA512 8b7cb353ff2c6259525909b62a6d552116339fe8489d747f7310fa9013011b6028c0f0dc165307ff5b9fe9da9517852c3e4158eb6f05a51f987e9cf2a969b949
 AUX pyicq-t.service 223 BLAKE2B 3f323776d36115207e5bd81f16c7c47b438bab74772cbcc3cabb5acb7ab992b0cb8edc6b76def436a9d65685d232754d988cb2c7dcecdc8bc5a2152cfdd0ceb7 SHA512 e1df68340f54bc6568308fefcc723323358c27b143cd3258f451ebf06e5f6ac0a7b66d7567543212e5924144164e0d9a2121fb96fa2721b234399a19127850c6
 DIST pyicqt-0.8.1.5.tar.gz 183865 BLAKE2B 5f0cce6fd9d27cf60f6234870644c95e016bc979a167d48a331df47cb25eefca96ed0082d336c931a6af5f25babaa7fdffc0cafdb0374463c066d5c185b02059 SHA512 5b83adf86746c2af60bed2759c7d4e3a3839bea532e0882a6dc087aee5e0afa1320c6d2d2296a667ec45c5b36be879034f079fd30cef924e8db5f66a2f1d3fde
-EBUILD pyicq-t-0.8.1.5-r6.ebuild 1749 BLAKE2B 6b1fa86374cf440a0364a4330f10f995cbd290b9c223d5caf045d12931c21486da88d4833a7c65c316d31375bfb509b71fa971f01e8ed066303a0c338a934748 SHA512 1c28862d2d7ddc0a79b9379ea235621d49d304dc3a2feee7995980d01b683dbfb0eff19295b5142c5fb0e4aec584629b05baa5889afe866fdfe7a3f32d9ec229
+EBUILD pyicq-t-0.8.1.5-r7.ebuild 1821 BLAKE2B 994bc77aa62b5fd280b8218433b4350bc21447cf811953d985a63a5b606776130e62a463fcaabed1c92be4fb15335ff872f8dff8c3a3a7583a2796465eb0b89f SHA512 0bd681973b32c55b99bf1c6babedfd35eee11b72f4134cc6846da3ff54da76717ac805a3bd411cb963f614d73f821321121f861eca0b38500eb1eded2a49d84b
 MISC metadata.xml 419 BLAKE2B 89f7918635ee4ead843dee7a7b031eefc427b5df2c5edb25a3b891e21046ac346386a1270d69820594cd23957bab8690d0c55246696ffb204d8fe636ae097dfb SHA512 1f30a23054f9f867a94d7e899f5be0780b08cf070c9a2831a34f4fbafe03e19dc9fedb023d3825411104a7322e0d0c8b6928a4f30794511371dd9ec7ea2e339f
diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5-r6.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5-r7.ebuild
index ec0c387fbfa9..12ace01e92dd 100644
--- a/net-im/pyicq-t/pyicq-t-0.8.1.5-r6.ebuild
+++ b/net-im/pyicq-t/pyicq-t-0.8.1.5-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,16 +22,18 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}
 	net-im/jabber-base"
 RDEPEND="${DEPEND}
-	|| (
-		(
-			dev-python/twisted-core[${PYTHON_USEDEP}]
-			dev-python/twisted-words[${PYTHON_USEDEP}]
-			dev-python/twisted-web[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		|| (
+			(
+				dev-python/twisted-core[${PYTHON_MULTI_USEDEP}]
+				dev-python/twisted-words[${PYTHON_MULTI_USEDEP}]
+				dev-python/twisted-web[${PYTHON_MULTI_USEDEP}]
+			)
+			dev-python/twisted[${PYTHON_MULTI_USEDEP}]
 		)
-		dev-python/twisted[${PYTHON_USEDEP}]
-	)
-	webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_USEDEP}] )
-	dev-python/pillow[${PYTHON_USEDEP}]"
+		webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_MULTI_USEDEP}] )
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+	')"
 
 S="${WORKDIR}/${MY_P}"
 PATCHES=(
diff --git a/net-im/slack-bin/Manifest b/net-im/slack-bin/Manifest
index 262fa6a81a2a..67bd5bb27a1c 100644
--- a/net-im/slack-bin/Manifest
+++ b/net-im/slack-bin/Manifest
@@ -1,10 +1,5 @@
-DIST slack-desktop-2.1.2-amd64.deb 46460486 BLAKE2B c6478764d3bd49745f9626d85287489fd58345b1315e41fdb1bfa9b93e4201aeeb2a22678e79f584c3da26d090136c1b8b18e449b518a69a0291072b5fc05089 SHA512 b23ccee498c2c6d043bdb4632b1b2755b3f0a96a1d78338020fb4221c49b7feeb437cc358abcf285e0f0a0f7b57f4db6792b2baa8b339596a287f1272ed12284
-DIST slack-desktop-2.1.2-i386.deb 42997902 BLAKE2B e5b3375efbe00d31e34c900aedde4c6c19b0e6a550d9db6155d9f8333c9d6db241da60e9b711eee7dbf6cf89d5ac4b84050c9e89c490172b7db205f38981dca3 SHA512 6b68123d3c85687043e886974449fe424af267c326ffc869d03d911ae5d0f30f5081b611e136bc4f832da8d555b2851a4c093df9c8be2de98235ebcd03528d8c
-DIST slack-desktop-3.1.1-amd64.deb 60320286 BLAKE2B 3054e8283b41d5b8b45323131b2a85800ba8b8e24e0b80aa0eff0c0152c7cad0a2914bf64a6b83621cf6c9ad52b9bf26c0d113cf5867d4c3f2e7d6129d4d27ae SHA512 06f209b07d1bbbadede592f4e63da7c53436ecc821585448269d4eda16ad0bdf8355ac46e508741150fae6dc883c90563509361f47dd02fda2f15b2829dda309
 DIST slack-desktop-4.1.1-amd64.deb 57986912 BLAKE2B eb90dff156eb826f8f15c3ab7c7c7127a321cd73011a11c6e24bc75721f4fa981980ad5b65e4accdce2fb893ac5ad8ddba42133de8285d8a9e10ac08bdb3ed70 SHA512 57b3e7a5a81406047bb9f8f8bb8ac322d3c801fe21919a388ac1457ccc68e50dab961c86a0e36ba9bb308e1832dc2ad00a038cddbad8ea9cc70ac186b37fec7c
 DIST slack-desktop-4.3.2-amd64.deb 54914760 BLAKE2B 218d4ba6cc2057bb92b84bd8bbbf94e70022a9e65363c256190584f0a92e1615642583647af2813e02ec2eb243a3428016b1bff3bfbbc6a98f227aa63a94a967 SHA512 36536be0825e1803704304346ea9db2d1d03baddec954dea0c4560bec2b1800cf3e6d431796d1fcd3b9178e3eb070e9ae6da64e4d3949eff649050cab21d5cb2
-EBUILD slack-bin-2.1.2.ebuild 1769 BLAKE2B c667beab3b7754601efcce865265974c3c959189b41465b055ebe8402e9369009d1a1abc486422c6267e49737e5bf51ec8608cdca74b8e20e59ccc88d8b9c7d0 SHA512 195c9b12c1ecda6afcae9cfec0710f30cac1480f5aa5f4ec6f5bd42550b6e012ab30e0be67f5c979db2be41357f47a7bbab44506c67bc23c1caa3ae43125d38b
-EBUILD slack-bin-3.1.1.ebuild 2731 BLAKE2B 6a74a81ee7c1c9734e1f0176f530b4068e1b3f8b506ce7b2ebecb76a3eacfffc11b6a5e1fa7c7ad03db15763b19010297508600a1269b368a871468b65e64b3c SHA512 5b67498636859305edeb88d9317c8836a04d00208861c041387e14222a303b095c85d2236dda7312fcdfb3e2ef01e8e037050a909d96ec71be1aaaa809a40ac0
-EBUILD slack-bin-4.1.1.ebuild 2928 BLAKE2B ba8c02c1e35ce1b759fbe47787c5ed60d26a12d24a9b2394e497e38804e3003dc03cb29520e42660d3752a1d2c46b4a072c8b07d63bf98d23739a720bb29d800 SHA512 47a641db9d39835b62d927fe8abaca3641435548b0556b1798a307f4906cf8ed02371113db2ab6338929714838d7d624058eaf0a2a2be9ffc3d02885d1fcbdbc
-EBUILD slack-bin-4.3.2.ebuild 2970 BLAKE2B 4c91170baf75aade85a99b8a874dd591c258c6e257662d40c5901ba6fe7a5b642a08511489048804f8bba387e902999e4a513db2f0de469f9bf2f7b28057fae8 SHA512 55923540730fd8a31448eec583293c2eb2cac1d5047d4a481f8c23a305db5cd017ed1ae26d5b87e19852b294979daffc46fc12663cf4347a55cf5a16a94bb9d3
-MISC metadata.xml 770 BLAKE2B b84907f7e6edab20de957ec2ecb5e9acb2c3167095b0a89bd41e00187d47defe6e2737324ca4b7ac2b01c16f5e12db118889bccdf3dd8b17a4ebc50b84be97e2 SHA512 6dba8262370ebbfceee5a9b8c26eca95b11271c74490ece09cec90a698d614902cec29104695692508a2d6b30a87efb1b82d44bef2edef828e26634c06aa6828
+EBUILD slack-bin-4.1.1.ebuild 2926 BLAKE2B 8b95487523e3f3319326e65bffc528327bb9d9b795556b13352e5288592afe3ba258b47c36e2c6fb9baf7d9145f29bdd4dbf94ffe7b68694afee1a06b6d59260 SHA512 99752a6649649e834764b43f991a2a888cbdabd361beeeac09ddf858292ba946f9897b9a4b609990c0444a11e78ff1c5757df8d082f1ca598bbfc2af7fca5c08
+EBUILD slack-bin-4.3.2-r1.ebuild 3026 BLAKE2B 226854b9d37a1cce89e4dd7039816ee9c2a5f8f83914bd2698b9ab21eb806c31ebac359a0cad0eb82af730fd172993fc012aefab165631226f3432be221c9a3a SHA512 c7ced833f00d6f6a6a6a16b2e4e579b637043f14c030d9551ce16b5120ff6c0e8cbdc91461e5f5a3779a2ce16a1b2687cf9befe48615033e5e29a18cdeeaeb9c
+MISC metadata.xml 686 BLAKE2B c0ea120b511e6be9968a728646f1af1ee6e791f5d7c8eb10d9ffd612328118bedf74ff705183995b2124c39570695c4b2a91b69d977b7fc0467cae738b664fca SHA512 f887850e1eacc25eaa94f3a249f86664454a05f7d205c67bbd89ed9afb77e1e2b5f3cf3d8596c0a3e26e70e420b486c29f07449929de2a7261aa516e2c887631
diff --git a/net-im/slack-bin/metadata.xml b/net-im/slack-bin/metadata.xml
index 200d6a674a29..15eca405ed06 100644
--- a/net-im/slack-bin/metadata.xml
+++ b/net-im/slack-bin/metadata.xml
@@ -15,9 +15,6 @@
 	All content inside Slack is searchable, including files, conversations,
 	and people.
 	</longdescription>
-	<use>
-		<flag name="pax_kernel">Triggers a paxmarking of the binary</flag>
-	</use>
 	<upstream>
 		<doc>https://get.slack.help/hc/en-us</doc>
 	</upstream>
diff --git a/net-im/slack-bin/slack-bin-2.1.2.ebuild b/net-im/slack-bin/slack-bin-2.1.2.ebuild
deleted file mode 100644
index 6a7b8f24e9b0..000000000000
--- a/net-im/slack-bin/slack-bin-2.1.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/-bin/}"
-BASE_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-_arch_.deb"
-
-inherit eutils gnome2-utils unpacker xdg-utils
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="http://www.slack.com/"
-SRC_URI="x86? ( ${BASE_URI/_arch_/i386} )
-	amd64? ( ${BASE_URI/_arch_/amd64} )"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist mirror"
-
-RDEPEND="dev-libs/atk:0
-	dev-libs/expat:0
-	dev-libs/glib:2
-	dev-libs/nspr:0
-	dev-libs/nss:0
-	gnome-base/gconf:2
-	gnome-base/libgnome-keyring:0
-	media-libs/alsa-lib:0
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	net-misc/curl:0
-	net-print/cups:0
-	sys-apps/dbus:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libX11:0
-	x11-libs/libXcomposite:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXi:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXtst:0
-	x11-libs/pango:0"
-
-QA_PREBUILT="opt/slack/slack
-	opt/slack/resources/app.asar.unpacked/node_modules/*
-	opt/slack/libnode.so
-	opt/slack/libffmpeg.so
-	opt/slack/libCallsCore.so"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/pixmaps
-	doins usr/share/pixmaps/${MY_PN}.png
-
-	newicon -s 512 usr/share/pixmaps/${MY_PN}.png ${MY_PN}.png
-	domenu usr/share/applications/${MY_PN}.desktop
-
-	insinto /opt/${MY_PN}
-	doins -r usr/lib/${MY_PN}/.
-	fperms +x /opt/${MY_PN}/${MY_PN}
-	dosym ../../opt/${MY_PN}/${MY_PN} usr/bin/${MY_PN}
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-im/slack-bin/slack-bin-3.1.1.ebuild b/net-im/slack-bin/slack-bin-3.1.1.ebuild
deleted file mode 100644
index 60d3a3890b84..000000000000
--- a/net-im/slack-bin/slack-bin-3.1.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/-bin/}"
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit desktop gnome2-utils multilib-build pax-utils unpacker xdg-utils
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="http://www.slack.com/"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="ayatana gnome-keyring pax_kernel"
-RESTRICT="bindist mirror"
-
-RDEPEND="dev-libs/atk:0[${MULTILIB_USEDEP}]
-	dev-libs/expat:0[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr:0[${MULTILIB_USEDEP}]
-	dev-libs/nss:0[${MULTILIB_USEDEP}]
-	gnome-base/gconf:2[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
-	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	net-misc/curl:0[${MULTILIB_USEDEP}]
-	net-print/cups:0[${MULTILIB_USEDEP}]
-	sys-apps/dbus:0[${MULTILIB_USEDEP}]
-	x11-libs/cairo:0[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-	x11-libs/libX11:0[${MULTILIB_USEDEP}]
-	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
-	x11-libs/libXext:0[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
-	x11-libs/libXi:0[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrender:0[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
-	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
-	x11-libs/pango:0[${MULTILIB_USEDEP}]
-	ayatana? ( dev-libs/libappindicator:2[${MULTILIB_USEDEP}] )
-	gnome-keyring? ( app-crypt/libsecret:0[${MULTILIB_USEDEP}] )"
-
-QA_PREBUILT="opt/slack/slack
-	opt/slack/resources/app.asar.unpacked/node_modules/*
-	opt/slack/libnode.so
-	opt/slack/libffmpeg.so
-	opt/slack/libCallsCore.so"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	if use ayatana ; then
-		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
-			usr/share/applications/slack.desktop \
-			|| die "sed failed for slack.desktop"
-	fi
-}
-
-src_install() {
-	doicon usr/share/pixmaps/slack.png
-	doicon -s 512 usr/share/pixmaps/slack.png
-	domenu usr/share/applications/slack.desktop
-
-	insinto /opt/slack
-	doins -r usr/lib/slack/.
-	fperms +x /opt/slack/slack
-	dosym ../../opt/slack/slack usr/bin/slack
-
-	use pax_kernel && pax-mark -m "${ED%/}"/opt/slack/slack
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-im/slack-bin/slack-bin-4.1.1.ebuild b/net-im/slack-bin/slack-bin-4.1.1.ebuild
index 158315e03e35..9441fc95cad4 100644
--- a/net-im/slack-bin/slack-bin-4.1.1.ebuild
+++ b/net-im/slack-bin/slack-bin-4.1.1.ebuild
@@ -85,7 +85,7 @@ src_install() {
 	fperms +x /opt/slack/slack
 	dosym ../../opt/slack/slack usr/bin/slack
 
-	pax-mark -m "${ED%/}"/opt/slack/slack
+	pax-mark -m "${ED}"/opt/slack/slack
 }
 
 pkg_postinst() {
diff --git a/net-im/slack-bin/slack-bin-4.3.2.ebuild b/net-im/slack-bin/slack-bin-4.3.2-r1.ebuild
index 8211ca719da0..701ae359224b 100644
--- a/net-im/slack-bin/slack-bin-4.3.2.ebuild
+++ b/net-im/slack-bin/slack-bin-4.3.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="${PN/-bin/}"
 MULTILIB_COMPAT=( abi_x86_64 )
 
-inherit desktop multilib-build pax-utils unpacker xdg-utils
+inherit desktop eutils multilib-build pax-utils unpacker xdg-utils
 
 DESCRIPTION="Team collaboration tool"
 HOMEPAGE="https://www.slack.com/"
@@ -15,10 +15,11 @@ SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="ayatana gnome-keyring"
+IUSE="ayatana"
 RESTRICT="bindist mirror"
 
 RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
+	app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}]
 	dev-libs/atk:0[${MULTILIB_USEDEP}]
 	dev-libs/expat:0[${MULTILIB_USEDEP}]
 	dev-libs/glib:2[${MULTILIB_USEDEP}]
@@ -46,8 +47,7 @@ RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
 	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
 	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
 	x11-libs/pango:0[${MULTILIB_USEDEP}]
-	ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )
-	gnome-keyring? ( app-crypt/libsecret:0[${MULTILIB_USEDEP}] )"
+	ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
 
 QA_PREBUILT="/opt/slack/chrome-sandbox
 	opt/slack/slack
@@ -90,6 +90,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	optfeature "storing passwords via gnome-keyring" app-crypt/libsecret
+
 	xdg_desktop_database_update
 	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
index 1f6747742328..8a1a39c84559 100644
--- a/net-im/swift/Manifest
+++ b/net-im/swift/Manifest
@@ -2,5 +2,5 @@ AUX swift-4.0.2-boost-1.69-compatibility.patch 2986 BLAKE2B e81cdaadaa7fe4972df1
 AUX swift-4.0.2-make-generated-files-handle-unicode-characters.patch 1517 BLAKE2B 78abb2fb27a796d2b0ba1c4d9ee2a5662a3a166b404f16ca67cb0b884db65d36a95b95a82827a7d2cfcf1b65204ebe23b11791b94fa4a88b85a72c1f1b12cf10 SHA512 57cb292b32365d7041a3d9b17488288e07eba5402bdc0db5ec3ff447a5ad7b3dfe7d13275d8783ddf6d338831a9bee93d481b74342d8d57a62486b3b7ca7689e
 AUX swift-4.0.2-qt-5.11-compatibility.patch 931 BLAKE2B 9c19851501a5b7bd92cb0cd8e71911ee87dc754f8d7dfe15f7fa3ff9d788f3d698a63cd90f6ff9b2cc4b013a14c92bd704ef0248ea71204645ea4ff90d828881 SHA512 a91d516f682b47573de8949ff5e364505b39d67e6a93441f66000519f8c6d910f7efb67ee510f709d03592446a4fbee0b1f17b0e1b7548ecaa2e3781e8406880
 DIST swift-4.0.2.tar.gz 19083393 BLAKE2B de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812 SHA512 b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167
-EBUILD swift-4.0.2-r1.ebuild 4378 BLAKE2B 9c0b99f20778d91e9ff2acab0c2abf23aa7118b5ed3850ee3d6d54285de0dd482219ca082bac69475f3a36caf900ded6234a80e27e5bc1edf5fab90a18162f9c SHA512 973ea48101c7298d9d4ac6bce5950ad7400b2249842d7eda0bba519ecc18d1d58fdf6a11443c278dc1d4ec02b9befb90b7d91b020eceda369232953ea53ef343
+EBUILD swift-4.0.2-r1.ebuild 4372 BLAKE2B 01d07faee10b57d6c0d728f4ad2f44a6862997def4640ca4ee0ce845e97a15380a584b64c0495615324c61b09f50afdfa5fd03ed1ec1c08670d2edd36a218c46 SHA512 4aaf1fd54d20ecb6e6e402018fb47f2883d2a3ebd51e7958f313912d1f1090d8d16e777b601752cfb0e73545258ddab424fb510412fb9838a816085a60b48769
 MISC metadata.xml 851 BLAKE2B 014ba09099a0971ceb413f590ba7f8e16f661380f15e12a319077886847c14695ab52f10afd7ce165b07cd9852e00397720ccf4465f475effec1cee65ad5b752 SHA512 1dbe2f86f1a0826b3ad0c629493fb0b9f9b1a1e2435e761a4e55afe85c52a7eef1269f25bfa94c4c8fbd5a8c5604d6c0bff6d0cb9d011245c1273df2a162bea7
diff --git a/net-im/swift/swift-4.0.2-r1.ebuild b/net-im/swift/swift-4.0.2-r1.ebuild
index eac7d6fa9d5d..78727eb9aba8 100644
--- a/net-im/swift/swift-4.0.2-r1.ebuild
+++ b/net-im/swift/swift-4.0.2-r1.ebuild
@@ -74,9 +74,9 @@ src_prepare() {
 
 	# Hack for finding Qt system libs
 	mkdir "${T}"/qt || die
-	ln -s "${EPREFIX%/}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die
-	ln -s "${EPREFIX%/}"/usr/$(get_libdir)/qt5 "${T}"/qt/lib || die
-	ln -s "${EPREFIX%/}"/usr/include/qt5 "${T}"/qt/include || die
+	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die
+	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5 "${T}"/qt/lib || die
+	ln -s "${EPREFIX}"/usr/include/qt5 "${T}"/qt/include || die
 
 	# Remove parts of Swift, which a user don't want to compile
 	if ! use client; then rm -fr Swift Slimber || die; fi
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 7ba4aac712c8..2fc5bf3aa6eb 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,8 +1,11 @@
 AUX 0002-PPC-big-endian.patch 791 BLAKE2B f24d1f799eb23f4aa0ed3324996027014c790ef3ed249ef1b48748529b7e7af622d7db34fbe0cae06539913b5e20512f490e7a609b952273aa990baef20de374 SHA512 26aab35d254bdeb89aff05fa5ec84c405e2c939f300f923c0e7adb452e50442d140104fe74f6bd39ab533493314118de3bfed7f3a931c2c5442da6fccdb6e390
 AUX 0003-PPC-config.patch 907 BLAKE2B 3d7a74ea4ee52f3b07ec11bf6c30425bd6555e57c99de931e6e029f4dd70c1bf8a6c3a5678b671c5060a47c0ed44b3ce4d175ef0ef79b40aabbc902d8ddf9d62 SHA512 3f0b214ea6510609f2c312b057e926239fa404d4d834bce0688fa5756768e996fd6a89b03a8a11f106ea744daafcea71d35211761bb772400274084618d78e9a
 AUX musl.patch 493 BLAKE2B fa27c9442075c6adcc48a7d282c1ba1e143cb1da05dd8b9fbd4317a7a3fc485112a98db54ffe947366913c4e18c54208d29045f0660525f2c65d91caaa032436 SHA512 9b9a9b623edcce37339e52e3e306a7106b6289749fca1b2dc7450c299da1a6f8d3f3f12b4973ecfbf3797f75ba88cf7f644adee896b053a683df4e4754d5d057
+DIST tdesktop-1.9.10-full.tar.gz 25272713 BLAKE2B 26b2eb49b5b55dac21be46d37ff7ddd3b6ea4490e58d8a04aaada3237b81cfbb87f2422d179882407501db2a597718f4974629791c8d3f165673fe953bdecbf6 SHA512 128dc3fd42196ebf61853917914c3d33fb148d3e6b04847ffa6d4df5baa8d9e286e7d25317b0dd2a332f1475f60b5addd19bb6e25a0fa6bbca316c22235569c6
 DIST tdesktop-1.9.8-full.tar.gz 25225784 BLAKE2B d938dc5d82740f93c575f621697e4bae430dc045c18437957bead6cc949ad0643b0422d8fd2a1695af921ea7f259ca323094a4a7821855d842edfaf4f328c840 SHA512 5562eb99812a8faec74fe073323d6e04e36311c1e4ce984035212ecfed8bd5d12df92cd0f0022401201136315fb5556971b267b4bf47edf4eeddc9926c7969dc
 DIST tdesktop-1.9.9-full.tar.gz 25221934 BLAKE2B c8f6252fd6e72785a39c92f04e5dadf322775fc1a178f2c6dac9e38cb654b9eb924c16cffcf9dc47e2e309e4f27a13ea07235146e7d7960b6bd0a342a3645e03 SHA512 ba6400e6f5eec5bda6e8a54b43846e695b2cce731cb6b39f17407cc39e3e9b8078d977253d29962671f30e33dbe012f8e40f340f781fd8ca73487e5f2d42e3de
+EBUILD telegram-desktop-1.9.10-r1.ebuild 4147 BLAKE2B 9c56a92fba6fc18ccdfe43c9845b909e09d6e2ab79eba5ee62c3040951e614ba940a9799c4c2b91b87ad5a8979b69eb894793ca3dcd6ce6347b16978bcc21240 SHA512 707308a17b456de541ab9981709dba284639db06a3a6e623b4b64aea8d892def9646f82435d7bb2a9804d10bcb0d360b98da02067b5864ef7d6486b09c1cbfe6
+EBUILD telegram-desktop-1.9.10.ebuild 3973 BLAKE2B 92ffd553c7ec4663ec1c78e75dabdf02388629e0a4a8333146be1b9367ee345e546249cc78106068d4774b5397574f0e1b0e7f90607d350a30446536a26c71de SHA512 1b79cb84b54ab23ad14a32893e4191f6f6442b9fa0628cbc5a31d0e834b15fabacaa69c14c82f873e03bdb618b65ca8e1087628a1f7d9e8fde68ac7f1a0907cc
 EBUILD telegram-desktop-1.9.8.ebuild 3614 BLAKE2B f51b090718b6464e7edcab33f9768ac13ec8f230af4eeb119b51d50ab32d559262ac55a516408bb6587c7623d9c0486a6955158fc5a40cd0d0bbe9d14ca317a8 SHA512 6d006d0d48b46aa2813273ea77f886ba4b196625116741caf9e1cc50304a88e561c53ffdb65441292e11b651e9e60dd65928324a366eb7fd2392dae14f073839
 EBUILD telegram-desktop-1.9.9.ebuild 3637 BLAKE2B ebc32472e1fd13ef27eeab43a43da1ee0e035c5e8cd5b88168a542289dd8b7f4a4867f11e89ef42c962fe21cb15c903929e61c0b74b263f227afef928ab719fe SHA512 db8388a3930fc4693ed99728fd826cc94dff511c98fb9f413db8b7cd317705b7bfb5a664ec17ddd6cc5c8894f511a7569a09cd7be347b8f288753b2833709de8
 MISC metadata.xml 348 BLAKE2B 57a3aaf9f66d41173fffd5d7c40d1d25beda8eb6e46c3259c253c1d644fa2ec22fd2725ef61ca38a7338caba1da5e7abba73d363448c1c5f6e7b7767f1e8d897 SHA512 8d7efddbb9a62b78f4bac0b00a92e588b527d7914b84b7c8b73d654d35893f2c26f31b8d5ccbde2e0020f2e420816b691cf77cc902eefe9f4375b4a82c2a328d
diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild
new file mode 100644
index 000000000000..660977c09e08
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
+
+MY_P="tdesktop-${PV}-full"
+
+DESCRIPTION="Official desktop client for Telegram"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="alsa dbus gtk3 libressl pulseaudio spell"
+
+# dbus still required to build, but use flag disables dbus usage at runtime
+# pkg-config will pick up gtk2 first if found, needs a workaround
+RDEPEND="!net-im/telegram-desktop-bin
+	app-arch/lz4
+	app-arch/xz-utils
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-cpp/ms-gsl-2.1.0
+	dev-cpp/range-v3
+	dev-libs/libdbusmenu-qt[qt5(+)]
+	dev-libs/xxhash
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtimageformats:5
+	dev-qt/qtnetwork:5
+	media-libs/fontconfig:=
+	media-libs/libtgvoip[alsa?,pulseaudio?]
+	media-libs/openal[alsa?,pulseaudio?]
+	sys-libs/zlib[minizip]
+	virtual/ffmpeg
+	virtual/libiconv
+	x11-libs/libva[X,drm]
+	x11-libs/libX11
+	|| (
+		dev-qt/qtgui:5[png,X(-)]
+		dev-qt/qtgui:5[png,xcb(-)]
+	)
+	|| (
+		dev-qt/qtwidgets:5[png,X(-)]
+		dev-qt/qtwidgets:5[png,xcb(-)]
+	)
+	gtk3? (
+		dev-libs/libappindicator:3
+		x11-libs/gtk+:3
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	spell? ( app-text/enchant:= )
+"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+BDEPEND="
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/0002-PPC-big-endian.patch"
+	"${FILESDIR}/musl.patch"
+)
+
+src_configure() {
+	local mycxxflags=(
+		-Wno-deprecated-declarations
+		-Wno-error=deprecated-declarations
+		-Wno-switch
+	)
+
+	append-cxxflags "${mycxxflags[@]}"
+
+	# TODO: unbundle header-only libs, ofc telegram uses git versions...
+	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
+	# EXPECTED VARIANT
+	local mycmakeargs=(
+		-Ddisable_autoupdate=1
+		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
+		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
+		-DDESKTOP_APP_USE_PACKAGED=ON
+		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
+		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
+		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
+		-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON
+		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
+		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)"
+		-DTDESKTOP_DISABLE_GTK_INTEGRATION="$(usex gtk3 OFF ON)"
+		-DTDESKTOP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
+		-DTDESKTOP_FORCE_GTK_FILE_DIALOG="$(usex gtk3)"
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		mycmakeargs+=( -DTDESKTOP_API_TEST=ON )
+		ewarn
+		ewarn "Building ${PN} with test API credentials."
+		ewarn "Connectivity to API servers will be throttled."
+		ewarn "To build ${PN} custom API credentials cancel build now and obtain"
+		ewarn "credentials here: https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md"
+		ewarn "After getting credentials you can export variables:"
+		ewarn "export MY_TDESKTOP_API_ID=\"17349\""
+		ewarn "export MY_TDESKTOP_API_HASH=\"344583e45741c457fe1862106095a5eb\""
+		ewarn "and restart the build"
+		ewarn "you can save variables in /etc/portage/env/${CATEGORY}/${PN}"
+		ewarn "portage will use the file every build automatically"
+		ewarn
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}/bin/${PN}"
+
+	newmenu lib/xdg/telegramdesktop.desktop "${PN}.desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512
+	do
+		newicon -s ${icon_size} \
+			Telegram/Resources/art/icon${icon_size}.png telegram.png
+	done
+
+	insinto /usr/share/appdata
+	doins lib/xdg/telegramdesktop.appdata.xml
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild
new file mode 100644
index 000000000000..9ef754c699fc
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild
@@ -0,0 +1,155 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
+
+MY_P="tdesktop-${PV}-full"
+
+DESCRIPTION="Official desktop client for Telegram"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3-with-openssl-exception Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="dbus gtk3 libressl spell"
+
+RDEPEND="!net-im/telegram-desktop-bin
+	app-arch/lz4
+	app-arch/xz-utils
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-cpp/ms-gsl-2.1.0
+	dev-cpp/range-v3
+	dev-libs/libdbusmenu-qt[qt5(+)]
+	dev-libs/xxhash
+	dev-qt/qtcore:5
+	dev-qt/qtimageformats:5
+	dev-qt/qtnetwork:5
+	media-libs/fontconfig:=
+	media-libs/openal[pulseaudio]
+	media-libs/opus
+	media-sound/pulseaudio
+	sys-libs/zlib[minizip]
+	virtual/ffmpeg
+	x11-libs/libva[X,drm]
+	x11-libs/libX11
+	|| (
+		dev-qt/qtgui:5[png,X(-)]
+		dev-qt/qtgui:5[png,xcb(-)]
+	)
+	|| (
+		dev-qt/qtwidgets:5[png,X(-)]
+		dev-qt/qtwidgets:5[png,xcb(-)]
+	)
+	dbus? ( dev-qt/qtdbus:5 )
+	gtk3? (
+		dev-libs/libappindicator:3
+		x11-libs/gtk+:3
+		sys-apps/xdg-desktop-portal
+	)
+	spell? ( app-text/enchant:= )
+"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+BDEPEND="
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/0002-PPC-big-endian.patch"
+	"${FILESDIR}/musl.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycxxflags=(
+		-Wno-deprecated-declarations
+		-Wno-error=deprecated-declarations
+		-Wno-switch
+	)
+
+	append-cxxflags "${mycxxflags[@]}"
+
+	# TODO: unbundle header-only libs, ofc telegram uses git versions...
+	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
+	# EXPECTED VARIANT
+	local mycmakeargs=(
+		-Ddisable_autoupdate=1
+		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
+		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
+		-DDESKTOP_APP_USE_PACKAGED=ON
+		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
+		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
+		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
+		-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON
+		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
+		-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF
+		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)"
+		-DTDESKTOP_DISABLE_GTK_INTEGRATION="$(usex gtk3 OFF ON)"
+		-DTDESKTOP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
+		-DTDESKTOP_FORCE_GTK_FILE_DIALOG="$(usex gtk3)"
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		mycmakeargs+=( -DTDESKTOP_API_TEST=ON )
+		ewarn
+		ewarn "Building ${PN} with test API credentials."
+		ewarn "Connectivity to API servers will be throttled."
+		ewarn "To build ${PN} custom API credentials cancel build now and obtain"
+		ewarn "credentials here: https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md"
+		ewarn "After getting credentials you can export variables:"
+		ewarn "export MY_TDESKTOP_API_ID=\"17349\""
+		ewarn "export MY_TDESKTOP_API_HASH=\"344583e45741c457fe1862106095a5eb\""
+		ewarn "and restart the build"
+		ewarn "you can save variables in /etc/portage/env/${CATEGORY}/${PN}"
+		ewarn "portage will use the file every build automatically"
+		ewarn
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}/bin/${PN}"
+
+	newmenu lib/xdg/telegramdesktop.desktop "${PN}.desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512
+	do
+		newicon -s ${icon_size} \
+			Telegram/Resources/art/icon${icon_size}.png telegram.png
+	done
+
+	insinto /usr/share/appdata
+	doins lib/xdg/telegramdesktop.appdata.xml
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-im/telepathy-mission-control/Manifest b/net-im/telepathy-mission-control/Manifest
index 9e13ef263f37..204fd90e4e31 100644
--- a/net-im/telepathy-mission-control/Manifest
+++ b/net-im/telepathy-mission-control/Manifest
@@ -1,3 +1,6 @@
+AUX 5.16.5-account-fix-property-name.patch 1053 BLAKE2B 283fde75d8eba3f8c4240e49298233930d270c48ead6b3a4651de7553c35e74fb3b72108f570bf6133acac38f1751e2355b260b28af0d6ef9c8cf5c5102ada80 SHA512 a0161ddf307f9a690b1c741c20aee8fa05f3378da880d1a850f80cde0fc83fe2a95c541d4cb641d1e70995cc6cc75d27b6c5a8c110ec7330ad2a9a75df297012
 DIST telepathy-mission-control-5.16.4.tar.gz 1102177 BLAKE2B 4c7ad46c472b6bc20b559de48602bcee971fda5ed2fb139d4a67793ac0f2871cfff6db5f9775a3626e1f1860fe41f8e4d520f00d05d7230064d30b21cb3397bc SHA512 5ed624df2d041554af074c22a18db2405fa5bd41bec40edc574382eb9d8b9f93ff6f4be3042d27f950694a353f4192670e200f5f8865419701ca520a973959ed
+DIST telepathy-mission-control-5.16.5.tar.gz 1125142 BLAKE2B 1f39336d8221ec9f297ba9eeaed39ffc30d5b2ecde3b02148343cfb9bf4ec15d949a36feb6b92cef17d70f786840b8df9cf159eb8eb00462c64bfb8b41437b57 SHA512 6adeb3033853bef5b732e7b85da49b75bffbdc57d968b1e4313fd1452eaf8db96c3f7f50d41ebb7bfcb084a7f093a9eaccdb28c23d2777e149a90dec6d4ef4e4
 EBUILD telepathy-mission-control-5.16.4.ebuild 1231 BLAKE2B 5d7de2122d8dfe734092ed3c71a18c23c3061f001fdb3076de324ac388f56182f3d83aff1e0dfebf9711eda078cf92a2b18024838ca56370c32a16be252e9e10 SHA512 ab53e2deefd8eaa08bb2d5801c575203bb62a523edf3dc085b04e2bea46f233b2ecdb4517e52eda0009456d3904bfcce79ea20cdf81ea133d931afab1e3d2509
+EBUILD telepathy-mission-control-5.16.5.ebuild 1311 BLAKE2B e45b9dcf47a8970a7e2b6989cdd0d256d83354ac762f9c5b8aca066fa73f90dacbe46994a31cb83e642fc03804326495c739e8b26d36f1a10818dedcdebac91e SHA512 f11db8194979ce1e7ebdfc02da89194f0115ed0f7513bf08681d9b51c738f758415051408b75518f6107b996d3580299209a14fda4bcdaa7bd17a67b0d1563bf
 MISC metadata.xml 599 BLAKE2B f96e565e553f14b0ab55f8b53ed520e9253611da9cf26b5f43ba35cceeb808a9be1dfc4968929ab62faf3af116d3c98c4e89b63260fb6779f397cfce4f06dee1 SHA512 fba9a9332501e7fce4d62efbbb643cde3579a393918cf6ecc59cb1aae6bd04adfb62d379d446805d01ebed51f9799ad453fdc7490268616e127ff128142f4868
diff --git a/net-im/telepathy-mission-control/files/5.16.5-account-fix-property-name.patch b/net-im/telepathy-mission-control/files/5.16.5-account-fix-property-name.patch
new file mode 100644
index 000000000000..17eb7f1f0415
--- /dev/null
+++ b/net-im/telepathy-mission-control/files/5.16.5-account-fix-property-name.patch
@@ -0,0 +1,25 @@
+From d8dab08fe8db137c6bbd8bbdc3d9b01d98c48910 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Thu, 19 Dec 2019 13:37:49 +0100
+Subject: [PATCH] account: Fix property name
+
+Spaces are not valid characters in property names, and never were.
+Until recently GLib silently fixed up the name by replacing the
+space with '-', but now tightened up the validation.
+---
+ src/mcd-account.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mcd-account.c b/src/mcd-account.c
+index 8009110e..de5c61cf 100644
+--- a/src/mcd-account.c
++++ b/src/mcd-account.c
+@@ -3442,7 +3442,7 @@ mcd_account_class_init (McdAccountClass * klass)
+ 
+     g_object_class_install_property
+         (object_class, PROP_CONNECTIVITY_MONITOR,
+-         g_param_spec_object ("connectivity monitor",
++         g_param_spec_object ("connectivity-monitor",
+                               "Connectivity monitor",
+                               "Connectivity monitor",
+                               MCD_TYPE_CONNECTIVITY_MONITOR,
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.5.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.5.ebuild
new file mode 100644
index 000000000000..f54b59cbc4d3
--- /dev/null
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+# Needed for tests and build #489466
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome2 python-any-r1
+
+DESCRIPTION="An account manager and channel dispatcher for the Telepathy framework"
+HOMEPAGE="https://cgit.freedesktop.org/telepathy/telepathy-mission-control/"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug networkmanager" # test
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.82
+	>=dev-libs/glib-2.46:2
+	>=sys-apps/dbus-0.95
+	>=net-libs/telepathy-glib-0.20
+	networkmanager? ( >=net-misc/networkmanager-1:= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.17
+	virtual/pkgconfig
+"
+#	test? ( dev-python/twisted-words )"
+
+# Tests are broken, see upstream bug #29334 and #64212
+# upstream doesn't want it enabled everywhere (#29334#c12)
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/5.16.5-account-fix-property-name.patch" )
+
+src_configure() {
+	# creds is not available
+	gnome2_src_configure \
+		--disable-static \
+		--disable-upower \
+		$(use_enable debug) \
+		$(use_with networkmanager connectivity nm)
+}