gentoo resync : 25.08.2018

31 files changed, 561 insertions, 138 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index e195afde8e2d..2acf60d4c813 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/dino/Manifest b/net-im/dino/Manifest
new file mode 100644
index 000000000000..3056bbc4fbd8
--- /dev/null
+++ b/net-im/dino/Manifest
@@ -0,0 +1,2 @@
+EBUILD dino-9999.ebuild 1448 BLAKE2B efd97fa84a72985bc62e7cf97b43fa48233e33380cd9a0cb7ac74c1ffd3b47ab58fac50dd7a42f2b06be7b3ae09f834ee3f5c33f63aac66d7934ccffa9edc49e SHA512 1b757fd6c337de2f2e364d99305afe9df027d4332a51078df5d73f4afd377dd9d31e8d5b256c3ecb13c8ceb886b07ae90208c6e496aefd34a50d11d354863028
+MISC metadata.xml 575 BLAKE2B df85897e138ef2e19f9d4a700fe6b56b4aac9ac680ba68d9248465fd9ebfa0bb989591a9a47b91ad46009322c47a726bf773e86eda3697140629092e3d767650 SHA512 a5b5690198b7462f4abbfaacd2ff51e284dcaf1f721d92993cd42ce2bc4ccd543893cbeaa1af591cf676ccd68722ab18190fae0e3615d4defb272dfaec98c525
diff --git a/net-im/dino/dino-9999.ebuild b/net-im/dino/dino-9999.ebuild
new file mode 100644
index 000000000000..9b578c608889
--- /dev/null
+++ b/net-im/dino/dino-9999.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+VALA_MIN_API_VERSION="0.34"
+inherit cmake-utils gnome2-utils vala
+
+DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
+HOMEPAGE="https://dino.im"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+gnupg +http +omemo"
+
+MY_REPO_URI="https://github.com/dino/dino"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="${MY_REPO_URI}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="${MY_REPO_URI}/archive/${PV}.tar.gz"
+fi
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/libgee:0.8
+	net-libs/glib-networking
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+	gnupg? ( app-crypt/gpgme:1 )
+	http? ( net-libs/libsoup:2.4 )
+	omemo? ( dev-libs/libgcrypt:0 )
+"
+DEPEND="
+	$(vala_depend)
+	${RDEPEND}
+	sys-devel/gettext
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local disabled_plugins=(
+		$(usex gnupg "" "openpgp")
+		$(usex omemo "" "omemo")
+		$(usex http  "" "http-files")
+	)
+	local mycmakeargs+=(
+		"-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")"
+	)
+
+	if has test ${FEATURES}; then
+		mycmakeargs+=("-DBUILD_TESTS=yes")
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${BUILD_DIR}"/xmpp-vala-test || die
+}
+
+update_caches() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	update_caches
+}
+
+pkg_postrm() {
+	update_caches
+}
diff --git a/net-im/dino/metadata.xml b/net-im/dino/metadata.xml
new file mode 100644
index 000000000000..c488bca606f2
--- /dev/null
+++ b/net-im/dino/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrey_utkin@gentoo.org</email>
+		<name>Andrey Utkin</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/dino/dino/issues</bugs-to>
+		<remote-id type="github">dino/dino</remote-id>
+	</upstream>
+	<use>
+		<flag name="gnupg">Enable OpenPGP encryption plugin</flag>
+		<flag name="http">Enable HTTP file upload plugin</flag>
+		<flag name="omemo">Enable OMEMO encryption plugin</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-im/err/Manifest b/net-im/err/Manifest
index 21f5abda208a..a1bb52ddcf8b 100644
--- a/net-im/err/Manifest
+++ b/net-im/err/Manifest
@@ -1,8 +1,5 @@
 AUX errd.confd 167 BLAKE2B b55dc0ba17dfc50d6958ee7a547f1db1dfcedec6d117507b5a7b50070c770f9dccdcf30b40b214492d92a4239c5ec253c630b35c218e315df57e92d700a758af SHA512 0e8f6b86cfe3e57dbae2ecf7a035d084ac753c338871fe51462d522465777f5c8886a9a2fa7d69030ed53797b6ece89a3e3453162d5a9af76a5e1a2ac23db30f
-AUX errd.initd 678 BLAKE2B 76486bbc011676007c36e5b23cd175e3ebb10fde822c9e92191b431ff83737fe07446cbddbc19dadddf6a40f324b889229fccfac15592ad0ed12d60c43d7b8d0 SHA512 c7a32d4d81f7f9bc6a598796b0b219e6c6b3187e0fcb9035824cf183b98e4ac95688c106e594f72ab09260d1c5bdc02e09e976e04674b58549d91e2a801752cb
 AUX errd.initd.2 512 BLAKE2B 48eed9e9e2bd5c1f23c63bbae10750c8e638c4f6ce286dc7e56799a45f986dbdcd359ee9f6c06e9bc33bd249c41ea08f0e6692f47b17229b9e7eb51e52d0f6e5 SHA512 caa47f7252c3ff04c47ed6c3174e4121dd600d1f4601f8a08275d1bc072e25f3b6125ba73d6c9c90af67dcc72da3ffbe875c83f756d75208af916a5d7ef672fb
-DIST err-1.7.1.tar.gz 100716 BLAKE2B 6d47ec4e632210ed313342075f87e1857460b57dc9b32d4487b2980c9c99e2a852d27ae7a5c87ee6d8bc4bcd15577ca11934111f27c81979f8aca9d14223212d SHA512 5be7f6ede6694877e73226de4da58bc47e1230032bc9be8dd3e8fd1448afd1e3ae4c02ecbdb30343b98466bb0d3a8fbfbcb6609c5c50768a9be70b9d22f675a4
 DIST errbot-5.2.0.tar.gz 189305 BLAKE2B 96e275ee2a70fcab217f4a91c855192d8536cc177e0cafe08c8f55e17a09c06913c07e50473f87ea29e4537cd6389907615eba86d44756962ed59a87498be398 SHA512 d879e9da6647d697ead0a5f72fe83cf33614201863a9a62bc62c90d7ac0478e1e0902438c6f053d2ea56c940d68b136bbfa497175fb11647913bd7f139220aec
-EBUILD err-1.7.1-r2.ebuild 1949 BLAKE2B ef9089cfa7d5f25b2f6d40d856f41f6cdb204986094750f499f6e0adfd9d3938ef71f415f5672a718d1b339c1082e8ccbf9e5e742312ffbfa74531a8f8360447 SHA512 e4ac8a7fde302d6b7192cfb17f65f1df3b9aa7ec2508c1b3b0ef1c5c97ae2baa58a25d45c91f10c900167e0ec6774773e4bb145845e057f38140cbacbe6eda46
 EBUILD err-5.2.0.ebuild 2260 BLAKE2B 0fb41b5b311d5e53766543f806128e0154ba69fcb0a60db57d9dc73aff5726532e576c87da1badb343d09e24acbae58ce407a7e779de3f3487daec51e3622edc SHA512 dbd4b95ce2536ef1e0df5ba6ee02f57bf58d06ffac44de51f71364d9659bd103c1f9099dbb8b037ba08559bfbcecf6b04fdae595b4785b61c09adde6464db7f2
-MISC metadata.xml 661 BLAKE2B a381883c6d8d05f2baee14c9babde38553e7a28c9e88a46ccba3e03015f7de847c8f76fbb45997462eba11b8f0d3d81fcbb98ac7fca4e84b193e4a6b1dbb0cf6 SHA512 7ad90d101045ca2175dd6af80209341b34ac46aae952150a0efe43ed34b1bd96032c3fd62660b185987f49e6b3a66d4411b1ffbb4b56ab6035c21cf8e290c00a
+MISC metadata.xml 565 BLAKE2B 0f8c06a4387ace540e55b6c2411b11729246cdbf13b5a0cd2a3d6db52390953e41d4e3c44755b231069cea099acb7c0c54db110d596a0bc00fd148e49bad5b19 SHA512 b7181c500317c3b91a747e707dff966f42744a85b97f7b51b8aad30814b5464e092405bc3868900968cca1670637150ea259281463fa769cb1c3e39783d87285
diff --git a/net-im/err/err-1.7.1-r2.ebuild b/net-im/err/err-1.7.1-r2.ebuild
deleted file mode 100644
index 6ed14b926aec..000000000000
--- a/net-im/err/err-1.7.1-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils user
-
-DESCRIPTION="Plugin based chatbot designed to be easily deployable, extensible and maintainable"
-HOMEPAGE="https://errbot.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="irc +plugins"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyfire[${PYTHON_USEDEP}]
-	dev-python/python-daemon[${PYTHON_USEDEP}]
-	dev-python/xmpppy[${PYTHON_USEDEP}]
-	dev-python/yapsy[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	irc? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-	)
-	plugins? ( dev-vcs/git )"
-
-# Testsuite is broken since 1.6.3
-RESTRICT="test"
-
-# NOTES:
-# 1. It has bundled libs - for example exrex(see 'errbot/bundled' subfolder)
-# 2. Support for BOT_SENTRY option is missing, cause
-#    we do not have apropriate packages in portage yet
-# 3. Internal web server is broken(dunno why :-()
-
-pkg_setup() {
-	ebegin "Creating err group and user"
-	enewgroup 'err'
-	enewuser 'err' -1 -1 -1 'err'
-	eend ${?}
-}
-
-python_prepare_all() {
-	# Remove configparser and config from requirements as they are NOT needed
-	sed -i \
-		-e "/install_requires/s/'configparser', //" \
-		-e "/install_requires/s/, 'config'//" \
-		setup.py || die
-
-	# Tests are broken and should not be installed
-	rm -r tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newinitd "${FILESDIR}"/errd.initd errd
-	newconfd "${FILESDIR}"/errd.confd errd
-
-	dodir /etc/${PN}
-	keepdir /var/lib/${PN}
-	keepdir /var/log/${PN}
-	fowners -R err:err /var/lib/${PN}
-	fowners -R err:err /var/log/${PN}
-
-	insinto /etc/${PN}
-	newins errbot/config-template.py config.py
-}
diff --git a/net-im/err/files/errd.initd b/net-im/err/files/errd.initd
deleted file mode 100644
index 438d3dcc4501..000000000000
--- a/net-im/err/files/errd.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	# create piddir if necessary, bug #448498
-	local piddir=$(dirname ${ERR_PID_FILE})
-	checkpath -q -d -o err:err -m 0770 "${piddir}" || {
-                eend 1
-                return 1
-        }
-
-	ebegin "Starting errd"
-		start-stop-daemon --start --make-pidfile --pidfile ${ERR_PID_FILE} --background --quiet -u ${ERR_USER}:${ERR_GROUP} \
-			--exec /usr/bin/python2 -- /usr/bin/err.py -c ${ERR_CONFIG_PATH}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping errd"
-		start-stop-daemon --stop --pidfile ${ERR_PID_FILE}
-	eend $?
-}
diff --git a/net-im/err/files/errd.initd.2 b/net-im/err/files/errd.initd.2
index 460cd070f54d..460cd070f54d 100755..100644
--- a/net-im/err/files/errd.initd.2
+++ b/net-im/err/files/errd.initd.2
diff --git a/net-im/err/metadata.xml b/net-im/err/metadata.xml
index 93446d15f5a7..21914ed5cfe5 100644
--- a/net-im/err/metadata.xml
+++ b/net-im/err/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="irc">Pull optional dependencies, needed for IRC backend</flag>
-		<flag name="plugins">Enable support for installing plugins with <pkg>dev-vcs/git</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">gbin/err</remote-id>
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index bf03fcad2bd3..3a915acdd12f 100644
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -6,5 +6,5 @@ AUX kadu-4.3-gcc7.patch 266 BLAKE2B 1211251304c10c46df75d3fbc84dff1f560c89a533c8
 DIST kadu-2.1.tar.bz2 6013519 BLAKE2B 31df1b245ec402a44c60581084d4ec9216636e14a1c11d8609862d982ad08ff3717c16bc9431c21366ef9852eb0035828a11d8010178736ec6b6ebfbadfd971c SHA512 3f0e38aefbaf15f357ae8232b1364deb5954a2464895fafa0a324ad99c7d14c6ba7495bed51d628e04c30bbaaf8e49412c70bbbbf01a40f360406c1afba2384a
 DIST kadu-4.3.tar.bz2 8087786 BLAKE2B b63ce2beebb1fd1f64ae8e85430784c6c7d25a071e00342e33d97a2e49b25c02ab131fb30d591acc11a336427118d4dd23e03d89ad07ef066eca09d0463397db SHA512 fb3d16320894bbfbd50e695d61f305710e59bccce84319389a4047626e97da95ded0b35bc5f7e5d8c2ac96594693b14dd8dd8d46eb1863f89d3eec2e51c73cc9
 EBUILD kadu-2.1-r2.ebuild 2712 BLAKE2B fcd6b7ced431d192ddc7ea1f90e226d3b12449bfe815639f3d30162e78a7008918a3fe93401dfba105c9bab787d5060a7939183dd491bad20109209f3e3454c1 SHA512 fddb7b9f30b8310fc93734af671ac75273a704d31e6c3a3ba37e80d951329f08f5d4a783e51a0ed8a7c184c4a64997023aef07e5d76f426988fd9368e4a9f0b9
-EBUILD kadu-4.3-r2.ebuild 2592 BLAKE2B 09315408ef22f02a91b22c852af6ae93258c2b236020fc347f560d5b011579aa26f832b42259217a537b0035bfd9605b1170d309ac959b52e9ea351a1d865a6d SHA512 37739c785a86097eb1dc1cdc0b007549acd4a0e73e2b81a7dccf3f0762e450628c21a5ae50bf47d4c11b9f71ffe27ef63e598b0a41f08758356b7087025095c4
+EBUILD kadu-4.3-r2.ebuild 2591 BLAKE2B 9e859b20e3a792aa10faf4af381b9cc4b9a7ee070db93a0c827191f50cdffe1b5507d882d64ba56bbeec5c96ce73fc9f7aa90941ebb64761b817f1577b4b1cc0 SHA512 1c44d49c19ee9b9e0c0f9ccf5485ba4676c8157441f81fcf088596903ec06fd1f32c11e2c742a401e00000b7f055ac75c37b941ed625e3f3ddd842c4064ddb3d
 MISC metadata.xml 635 BLAKE2B 024363b73640cde3ad95f4c1a0a953cc87ea0786da585cdf7b69c75ed2c472120af558d099cced80eaeea6ff293f6502e1cc8e7b2a60621682947b28a95818d3 SHA512 91bc130c8ea984c22e84a1702216fb78956f9c25a60fadab7c9b2afa04067306ffa8936db29eb138b6f95c41b8b99ac18b26b4747a054bf56eb0af87f8cb0571
diff --git a/net-im/kadu/kadu-4.3-r2.ebuild b/net-im/kadu/kadu-4.3-r2.ebuild
index 7c7b4b2617f5..10dd889fae2e 100644
--- a/net-im/kadu/kadu-4.3-r2.ebuild
+++ b/net-im/kadu/kadu-4.3-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.kadu.net"
 SRC_URI="http://download.kadu.im/stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE="+gadu mpd otr sdk speech spell xmpp"
 REQUIRED_USE="
diff --git a/net-im/poezio/Manifest b/net-im/poezio/Manifest
new file mode 100644
index 000000000000..3d0408343027
--- /dev/null
+++ b/net-im/poezio/Manifest
@@ -0,0 +1,4 @@
+DIST poezio-0.12.tar.gz 585750 BLAKE2B d79cab965b39a9ea191c763e1560bedbf46e3107e1b301a651103caf8f9e63b8465925ea01ac4e2e6b747b66cf5d4be8cabd8be80a069fe4eafcf331c7daada8 SHA512 6249daf23c6f4c1b25a9de686abaa62076e1eac7566da0a174ae3a82e3a53b7f2a86145d20d587a7ee43c8b679d90cb381d5afbfc7860459c5a497e97af32ff4
+EBUILD poezio-0.12.ebuild 1252 BLAKE2B 6517051d452341fe765b9ccfe0b96d5bee2c4ea084c80742c241c283d7010e0ff108af251d0124858f1387d67bc1a7297647148208dd759b01f106c65be2c71e SHA512 f7e996b9fb61d5586689d2f17a5e3b993129a1da5a0e92aa4d24bf86daa4482d1ac2e2ced0d55302c77224cb09dd6f2e9bfa89b1caf0f79ed6f8b8eb4e84e961
+EBUILD poezio-9999.ebuild 1252 BLAKE2B 6517051d452341fe765b9ccfe0b96d5bee2c4ea084c80742c241c283d7010e0ff108af251d0124858f1387d67bc1a7297647148208dd759b01f106c65be2c71e SHA512 f7e996b9fb61d5586689d2f17a5e3b993129a1da5a0e92aa4d24bf86daa4482d1ac2e2ced0d55302c77224cb09dd6f2e9bfa89b1caf0f79ed6f8b8eb4e84e961
+MISC metadata.xml 320 BLAKE2B 38b85fd661f7ca7a79c83a1070753f1049b7de9049f2d233f32d77ddd2a8cf72cfc8e3b7b27065a5583d6c631a6af0aa3ca70b907ca9c2a2e92f85471da542b2 SHA512 874c300be76a1b931ddebfb8867563696884267891a09e0879e1ceb0f581536ab9acacccb104e9609aef5c61c55e05ebd87d867d332141be9d52cea246dad09c
diff --git a/net-im/poezio/metadata.xml b/net-im/poezio/metadata.xml
new file mode 100644
index 000000000000..0f3aace8afd4
--- /dev/null
+++ b/net-im/poezio/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrey_utkin@gentoo.org</email>
+		<name>Andrey Utkin</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">poezio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/poezio/poezio-0.12.ebuild b/net-im/poezio/poezio-0.12.ebuild
new file mode 100644
index 000000000000..d550ee29c570
--- /dev/null
+++ b/net-im/poezio/poezio-0.12.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
+HOMEPAGE="https://poez.io/"
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="test"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://git.poez.io/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RDEPEND="
+	dev-python/aiodns[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/slixmpp[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/potr
+		dev-python/pyinotify
+	)"
+
+DOC_CONTENTS="
+Install these optional runtime dependencies for additional features.
+* dev-python/potr for OTR encryption support.
+* dev-python/pyinotify for screen autoaway plugin support.
+"
+DISABLE_AUTOFORMATTING=true
+
+src_prepare() {
+	default
+	# Delete unmaintained plugin which requires an excessive external dep
+	rm plugins/mpd_client.py || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/net-im/poezio/poezio-9999.ebuild b/net-im/poezio/poezio-9999.ebuild
new file mode 100644
index 000000000000..d550ee29c570
--- /dev/null
+++ b/net-im/poezio/poezio-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
+HOMEPAGE="https://poez.io/"
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="test"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://git.poez.io/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RDEPEND="
+	dev-python/aiodns[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/slixmpp[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/potr
+		dev-python/pyinotify
+	)"
+
+DOC_CONTENTS="
+Install these optional runtime dependencies for additional features.
+* dev-python/potr for OTR encryption support.
+* dev-python/pyinotify for screen autoaway plugin support.
+"
+DISABLE_AUTOFORMATTING=true
+
+src_prepare() {
+	default
+	# Delete unmaintained plugin which requires an excessive external dep
+	rm plugins/mpd_client.py || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/net-im/qtox/Manifest b/net-im/qtox/Manifest
index dde3f5703c67..cb70ee5f9ffb 100644
--- a/net-im/qtox/Manifest
+++ b/net-im/qtox/Manifest
@@ -1,6 +1,8 @@
+DIST qTox-1.16.3.tar.gz 4256757 BLAKE2B 70103e2d912da86dab63424586c642a73614b4a408a53634b146d1e401d5b328a2b8c81c472a94e0e8804d774f693c1250e7263b263e80abef5e111372f29232 SHA512 a857266ffcf32b1963e3a4428501299ce19f3c087087583115dc01e41934fc31d52ea54d781fa93ec7e21f6e3303b4e22383ecaaa7f1f1dbf32d740db73aca4c
 DIST qtox-1.11.0.tar.lz 2860849 BLAKE2B eedb0720c57afd8a99e48452af67162977df0c4cb889891b082345b0b2d37539cef39d5be16b0e9ce0615561b6628c908e5d3007b96c23026859dc4d42261223 SHA512 3117b5ec9d88f58023f6c2f5e7c37c547ab920588d385e3abe062fb22ad79c49a9b6eb9ca31c6d56f9d03cfea55ef56ddc7e2e53bd43629825ea7b460b31f505
 DIST qtox-1.8.1.tar.gz 3594727 BLAKE2B a1d4191551b082cef21ee211eebf7288aa805bb2401e9c7a48359273fd6520c67eaf826f985843fd01ca0bd4312fab9da1169cbd8b7b61916e282dde06f9dee5 SHA512 9ba32ce43f2d335fe9e07bcca651e0e18ae2f3247e52364918148e400e51f6e2364d1596c7c882674c190bf5438e69cd13e77512eeeec7cba212195e9559a5ae
 EBUILD qtox-1.11.0.ebuild 1620 BLAKE2B 246d85e8d731d87bebae67ee154fd52a9c48a38abfbea788044bd1b7cfdb64fb7c70df216fd475e140dc30cfa33660e610c0d0d2dfe7ae1a1c8a57a9eb7c8263 SHA512 78eb94640ee216cbc111671e89e4bb3cb647cba0da35da55e4f6c5027a9cb32678efa23fe4c92c53e114be1d823428741b8387632f23fa96fe7478c485532420
+EBUILD qtox-1.16.3.ebuild 1581 BLAKE2B 29b96265e0675dde9acf9fcad20b0ab36f5450d9f1a2e4525ac470cd7a845c3c9eb5cfab3d4501745b3e58495d9bfa1b79abfd4eb262215101c5238d7f07439b SHA512 e189f0188ff4201f3d78b014a2c1242e8dddc3c805dec5fe38aaffa65cb2d8e3e3adec0c529333f48032ec97481bde0a8a14934b03907372181e079d51283e0c
 EBUILD qtox-1.8.1.ebuild 1645 BLAKE2B 46e40eea2eb11c6424ad3165d6adb6ac4c66d1ffc2fda29ccf811538cd6cecc43708bd59a07c884f9e2f8d921e5e990d3f14fc0b6051f46f60ee2c3e0a135803 SHA512 77f53452e5de2599f96828de62a42b5827aa716e204ecb907ca882b86851cb8c9152d9855555d25e7913662ab313193ae7cf9c1fd32425e3a2d52554e9c163a2
-EBUILD qtox-9999.ebuild 1531 BLAKE2B 728c7c62de2e5dcb68fff989f2b2d96f88df944e26318fc843cfd95efa2701d0e126a0c1880e56eb33d49d7bd0222b3cb8eaf2727c47081c0dac067ea3cc2576 SHA512 5d5d82ef5220545ae9f4be28a68fbfdf463b566280d1e5217ce475244c878b29e15bcaea9e2cec95759118da1e0a620c9d13f80c3bea1a7ba5f914ab95c6a85e
-MISC metadata.xml 382 BLAKE2B da6ba1556fdfe321ff206c5aae1389b6acbafbc50e546e94e67e6e32c33a09f637a8fcc48af5c98771ecce65a628ee24523db18dc9c4b142de46d151fd1d324e SHA512 285be9118fcc760301cad9bab6f5bc61b70498f262278e92c95f35eb48098aaa35e0f72ab693343394df8cb6c51673861a72402d9ca15978b52fc98e1ae7c87c
+EBUILD qtox-9999.ebuild 1498 BLAKE2B 046649895dcc7f10234d75e5ad9325dfb32035f2a6b2b523f686e06b5997051f00987b3035a6a38a4821d495ae32be6daacd0b9f278fc9b36469dae94e6a3911 SHA512 38af4bca3fb5ef242dcfae483d4b71ed007338b0c05f410fa7b990103a91e5a248a59a5fd03fd80f5e13e91a5d1f83674e1417340c1c109f619607390fe608a4
+MISC metadata.xml 387 BLAKE2B 16f71b094c5fcef1b3c0b3b7bb6bc962c9d7b332604d0c0d30676992b8ed0586b47d9b51470e41b5cd6c305895072661f8d7939ab90b780c28af460a80f660a5 SHA512 d941cb804aaf0f9d03fa699b0080b03afba798c5146ba21597349e65dc79c9c6a02fc23aec2db19403a19d906db3be55c56e5b8f4337a6871eb19ce3cecfe5cb
diff --git a/net-im/qtox/metadata.xml b/net-im/qtox/metadata.xml
index 1ce2420d23bb..aa2232cb4665 100644
--- a/net-im/qtox/metadata.xml
+++ b/net-im/qtox/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
-		<flag name="gtk">Adds support for GTK and Status Notifier tray backends</flag>
+		<flag name="notification">Adds support for GTK Status Notifier tray backends</flag>
 		<flag name="X">Adds support for X11</flag>
 	</use>
 	<upstream>
diff --git a/net-im/qtox/qtox-1.16.3.ebuild b/net-im/qtox/qtox-1.16.3.ebuild
new file mode 100644
index 000000000000..4bd474cc1f42
--- /dev/null
+++ b/net-im/qtox/qtox-1.16.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+MY_P="qTox-${PV}"
+DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5"
+HOMEPAGE="https://github.com/qTox/qTox"
+SRC_URI="https://github.com/qTox/qTox/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="notification test X"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="
+	dev-db/sqlcipher
+	dev-libs/libsodium:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[gif,jpeg,png,xcb]
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-gfx/qrencode:=
+	media-libs/openal
+	>=media-video/ffmpeg-2.6.3:=[webp,v4l]
+	net-libs/tox:0/0.2[av]
+	notification? ( x11-libs/gtk+:2 )
+	X? ( x11-libs/libX11
+		x11-libs/libXScrnSaver )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	test? ( dev-qt/qttest:5 )
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# bug 628574
+	if ! use test; then
+		sed -i CMakeLists.txt -e "/include(Testing)/d" || die
+		sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/d" || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_STATUSNOTIFIER=$(usex notification)
+		-DENABLE_GTK_SYSTRAY=$(usex notification)
+		-DPLATFORM_EXTENSIONS=$(usex X)
+		-DUSE_FILTERAUDIO=OFF
+		-DGIT_DESCRIBE="${PV}"
+	)
+
+	cmake-utils_src_configure
+}
+
+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/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild
index c635dfc405d4..3ad3165b1bc9 100644
--- a/net-im/qtox/qtox-9999.ebuild
+++ b/net-im/qtox/qtox-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,11 +13,11 @@ EGIT_REPO_URI="https://github.com/qTox/qTox.git"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS=""
-IUSE="gtk test X"
+IUSE="notification test X"
 
 RDEPEND="
 	dev-db/sqlcipher
-	dev-libs/libsodium
+	dev-libs/libsodium:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5[gif,jpeg,png,xcb]
@@ -27,17 +27,11 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	media-gfx/qrencode
-	media-libs/libexif
+	media-gfx/qrencode:=
 	media-libs/openal
-	>=media-video/ffmpeg-2.6.3[webp,v4l]
-	gtk? (	dev-libs/atk
-			dev-libs/glib:2
-			x11-libs/gdk-pixbuf[X]
-			x11-libs/gtk+:2
-			x11-libs/cairo[X]
-			x11-libs/pango[X] )
-	net-libs/tox:0/0.1[av]
+	>=media-video/ffmpeg-2.6.3:=[webp,v4l]
+	net-libs/tox:0/0.2[av]
+	notification? ( x11-libs/gtk+:2 )
 	X? ( x11-libs/libX11
 		x11-libs/libXScrnSaver )
 "
@@ -52,15 +46,17 @@ src_prepare() {
 
 	# bug 628574
 	if ! use test; then
-		sed -i CMakeLists.txt -e "/include(Testing)/s/^/#/" || die
-		sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/s/^/#/" || die
+		sed -i CMakeLists.txt -e "/include(Testing)/d" || die
+		sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/d" || die
 	fi
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DENABLE_STATUSNOTIFIER=$(usex gtk)
-		-DENABLE_GTK_SYSTRAY=$(usex gtk)
+		-DENABLE_STATUSNOTIFIER=$(usex notification)
+		-DENABLE_GTK_SYSTRAY=$(usex notification)
+		-DPLATFORM_EXTENSIONS=$(usex X)
+		-DUSE_FILTERAUDIO=OFF
 	)
 
 	cmake-utils_src_configure
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 24e5e07fc8e9..6dedf89f7111 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.15.2_amd64.deb 70027630 BLAKE2B 28feb05c3fc77cd430de99db823b5a0d8dcad88012ca27be847841a85e976e5b260f4db22b7061be991945399474397f88cd8990ac8295b0a35985777805f239 SHA512 cd0c10398e4df80849ffbf0ff4a5a7e1be832197fb19f5091798cf141cb9580fd64ba2c6353d87b26fbab6cfab53cfdcf18f7a2e4b73770506d615fac2b2a640
-EBUILD signal-desktop-bin-1.15.2.ebuild 1358 BLAKE2B d83ffa215febb3260b53ea9c8fe87f0329e7658a13d31cf99222b99edc74f330362872a07d14e851239aefadecad040f845b503094bc1130c1d1ef2eb53dfcfb SHA512 547b592cd8ace2f51e5ce09c31c84751245396a9d5fdc168a93be83e6a904e792fa60cefc3e7b0fcd85e029f18aa28a107874749a383a741fade91db6f6cffc8
+DIST signal-desktop_1.15.5_amd64.deb 70045774 BLAKE2B d315397d87d82c9b2b59795f433baf3d0312ced48742478626e28f23448549acec57e384047417125869e648c69c3f28a19724efc44f594588b3682666e2627f SHA512 91c38d04e949168d01a04636ac01abea52499432e1d898b04741bacb2509c3595001e785ff92e3e23371bf0ea94d304da83b3f1d50b93dbbf8e2a1128388a16e
+EBUILD signal-desktop-bin-1.15.5.ebuild 1331 BLAKE2B d3e7a435074bd50eff39edd4d8dae876ee1a7fbe6eb3231b5c9722211046e02f8c6242e7077004c5db425c78c642e02e8a9d6019d82c62e543a3dcd2b48c568d SHA512 025e29d647949489efae648a5e0a9c6858f9816a79d8d1cc172eb14c0ff9cd3448c1c3f83c7fa9507fd3af5678f96ce9dd1adc3f6be480783e96f5431045a6ef
 MISC metadata.xml 510 BLAKE2B 618fc8fb3b176d175bb15ceef941c60ebd89666f4b01f7b7912a4c26d8f54802982a8c089480f11573418daf88fb559dacca797c7f42493d122fd448c53eb923 SHA512 9d9ae0f5f1961fc1ad9b0e59f8d2003fc746f6f25dabb6c35b6ee8e151caf25e724b321e0c11a1b02f5431a204215caf5a4614232508b8492a0d33cd4bb46b8a
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.15.2.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.15.5.ebuild
index 078b15d4bb38..533fd0506812 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.15.2.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.15.5.ebuild
@@ -17,8 +17,6 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RESTRICT="bindist mirror"
-
 RDEPEND="
 	gnome-base/gconf:2
 	dev-libs/nss
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 5e42fcdb5ccf..8eda082c1353 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,7 +1,7 @@
-DIST skypeforlinux_8.22.0.2-1.x86_64.rpm 96073264 BLAKE2B d5d85ac5ba852ef50286894a4a3ff830e3763eb962f8e40cf4d2b9a9511394113991bd0de6cfe54fb8286c5bbe25ce516a640097f9240a947c7e70c97c7bcec9 SHA512 c628bcde1a467bf69e66bd8fc134bba18a2489d857659d386addb0659492bdc7884c29087411d5728074ae7f108f98be876b6330b1178e8ffe9792662bc9105f
 DIST skypeforlinux_8.25.0.5-1.x86_64.rpm 90947986 BLAKE2B af778f6bad5440a97186d4ca6ef61c8d22099dd9958aa6176b77cd5bfd8ebced8e914df0a4c71ec5c6a7374af5650fbb2fe86592c0b0512792910f02b4ddacbe SHA512 009a6403a4a3188c9054354629a993b3eff120d45af275b19ddfe4a28c9e9b3de2058913069bf6439e92bf9f087e0b795f35bff1c4e8e313730fa951735d981e
 DIST skypeforlinux_8.27.0.85-1.x86_64.rpm 94874950 BLAKE2B b96f79e66aa6b4e85abee2cbd7a94500f344c31ad3f0863a0bb5b360646b558823b6c289394f98cbc98da66bdbc7916e27aadbae15a0cb422cef10841cbf4679 SHA512 c30fd1d41c407719b480e2d04d18d192c585f33396f8923667d255309f9dcb7e258a4bc4383808872be728bada7f06d799be8c84930e8154c01771297f5d6fc2
-EBUILD skypeforlinux-8.22.0.2.ebuild 3679 BLAKE2B 6b98754fa280237e7282a69292efb1aeccc7838847c74fb2cef6b7a0966e5b1f8cf55cf782c58bb1c421b60c85779c3c0344655f5b9ef3f62c9557e31f162ec0 SHA512 a670fd3d915bca1e9ce0e8585bf87cc9dd1c24858d2d48e979ab9f57ba1e5539bc29edf3e502b4fbd93389347f5b152909e3f9eadd438e656ac4094b94adf116
+DIST skypeforlinux_8.28.0.41-1.x86_64.rpm 95603274 BLAKE2B 97698ab5dd7187471323e62ed43b6df8d1271eb4a7c2312bf4e271e31e193427888253610ca1132df61010e4260bafc73b8602945ba15fad1b89750aaab547e5 SHA512 11ebed4e273ab755da605be023642ed37eb6e66d48923fbfec2bf4fda40f64a0d89764016bfb4a3818bdcac9582d5510076ad83e1e50dfaeec35a2f9aa405eda
 EBUILD skypeforlinux-8.25.0.5.ebuild 3679 BLAKE2B 6b98754fa280237e7282a69292efb1aeccc7838847c74fb2cef6b7a0966e5b1f8cf55cf782c58bb1c421b60c85779c3c0344655f5b9ef3f62c9557e31f162ec0 SHA512 a670fd3d915bca1e9ce0e8585bf87cc9dd1c24858d2d48e979ab9f57ba1e5539bc29edf3e502b4fbd93389347f5b152909e3f9eadd438e656ac4094b94adf116
 EBUILD skypeforlinux-8.27.0.85.ebuild 3679 BLAKE2B 6b98754fa280237e7282a69292efb1aeccc7838847c74fb2cef6b7a0966e5b1f8cf55cf782c58bb1c421b60c85779c3c0344655f5b9ef3f62c9557e31f162ec0 SHA512 a670fd3d915bca1e9ce0e8585bf87cc9dd1c24858d2d48e979ab9f57ba1e5539bc29edf3e502b4fbd93389347f5b152909e3f9eadd438e656ac4094b94adf116
+EBUILD skypeforlinux-8.28.0.41.ebuild 3679 BLAKE2B 6b98754fa280237e7282a69292efb1aeccc7838847c74fb2cef6b7a0966e5b1f8cf55cf782c58bb1c421b60c85779c3c0344655f5b9ef3f62c9557e31f162ec0 SHA512 a670fd3d915bca1e9ce0e8585bf87cc9dd1c24858d2d48e979ab9f57ba1e5539bc29edf3e502b4fbd93389347f5b152909e3f9eadd438e656ac4094b94adf116
 MISC metadata.xml 684 BLAKE2B 90b427ff6ed13fb5046a188fc8476d45989bdb717c1a930e81270164d72b565942ecfd4f08821bcf265ef17fa79f515c205b314abd21b2e7335387ab10e7f93a SHA512 8a7481d0a0b8d453f7748491ebf12d34e1deeb2f0bfc618e27e15a1029bf04814afadc3ca169c12f1e7d199ec0deebcdf6369ccc6c6a41a2add78209c257f8c6
diff --git a/net-im/skypeforlinux/skypeforlinux-8.22.0.2.ebuild b/net-im/skypeforlinux/skypeforlinux-8.28.0.41.ebuild
index fe787944cfb9..fe787944cfb9 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.22.0.2.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.28.0.41.ebuild
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 450fd5db81ad..732a07aaf601 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,4 +1,5 @@
 AUX telegram-desktop-bin 222 BLAKE2B dc8af6a58e9841c9b3aae86286fb072e13f911f451e9f3718fb3dad9787616ba732d415091e8ebd56fef5ecd7bd4cf18e5a6897c18e2be1b8170d4df3f95c985 SHA512 28477ac203e31244d738f9698cf825821ead39dd2bb67a795155a0516cb0302b2e6c8e666754e4f37c91ed3227cc21bcfb09994334d158056b62f9482c4dacdd
+AUX telegram-desktop-bin-r1 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
 DIST tdesktop-1.3.10.tar.gz 17167027 BLAKE2B b1748abbfaa08ab22d26707b1b5be7e31dc804869a5ac5cf91bba823787758cd180d9cc41a96eb12787bf445aa6729d66df3aa4ad9acd338500c72da7725211d SHA512 91833405de4d68c6e791fbe3a6ed45926227bc8f7131ffcd2e048e38f8f74419050745a3a56dee926c708e187d9ae985d2efa564ad16fc75f18b60f48a601011
 DIST tdesktop-1.3.8.tar.gz 17127764 BLAKE2B ff9390803bbddbd939eb3173f89b42f161d06c81f3c4702562318d08ecbcfbcf548eab04b8bd80a6f4d546db2c6d5a20c3bf73d0db9ae8ccdd9f4c88048f8074 SHA512 4cef9a2b379b090f6993e4e391152d7fa02db3863c0758ea04f04bdac219ae96e4e43459a44a2857895264555f7bf93a03a9969b1f9bd194185cc7c6e746549a
 DIST tdesktop-1.3.9.tar.gz 17133428 BLAKE2B b8a8d0bf6d1ae2a55625284c16347b9f5da0f39bdad594b4ae6a8cfe57dce595da2ed54344a13641b31bbe4035b3b83ab9a1b3bce6880777ebd78c3f631c2e89 SHA512 7d9b908e038179448678eb0d29bb9ca62969674e199b89970bac85383ac839156c528939126413e6675901084a2c7d96a254195ebd1780a0b0816ae063f7c7f1
@@ -8,6 +9,7 @@ DIST tsetup.1.3.9.tar.xz 34532440 BLAKE2B 628597a1f04a676129f7b219fa991f1dcae51f
 DIST tsetup32.1.3.10.tar.xz 36904652 BLAKE2B 42904f09d4ce26f6d930028f81b7891dfab5ba7d780eace2e70f92752f69612eed6519ccf2ecb0420bd5bfb9f4c999476899df17abf41eca5d4b666bdb7fea9f SHA512 223db27115723cb011f4709ce39fe99228171986a954984a678065d780894d5845ab9bd90541a9cadc7ca6abd01f123ecd53491cd02c235f78615172f40a7a27
 DIST tsetup32.1.3.8.tar.xz 37194796 BLAKE2B bfcb48b9f65bc54e1b7c269b500424ec2687c45359aec89da310548d310c5abb9d71547e77a250580f63d077fcb9b477ccd4cd8ae40a4bb4666e216950a3b809 SHA512 cae2c1a6abf2f02515e2ad8df107ab2306c0d1d7d3edf8b04fbee5c2130a0ad4b9e61929fe9b7576dc6d55f42541c2b863c30c1e3aeb186be8c9948334ecdd44
 DIST tsetup32.1.3.9.tar.xz 37241464 BLAKE2B e83927531ecda2fdb3181c105b26d320857d9f047bb50ed17b38c8c8686675240c6b0b7acc139e06064746edaf3fc69af8eb6d12ab06dc49642ca39621594a8b SHA512 8d90b4e6568730e304714afd09daa70937784e82c9ad1a84a9808104a7731a3b61101042be3644b8a2d0982b2aac97827a8228bc0c3be311e233183a806ec623
+EBUILD telegram-desktop-bin-1.3.10-r1.ebuild 1288 BLAKE2B 084309f6fad4e2c074f4502afd0b0925727ef1e06565b4ccd24f66190e4526b9da3c2f2a132d910df6e88e6069f803e129f39783df56d895bd1ae8d76b0595d1 SHA512 91f05f18531ac5e9035598230a94f266bfa21102f8c1898eed0b90168bada5ce53a013ccf73b43cb9d66814d3f5c9bcbb62c98d79005299302456659856943e5
 EBUILD telegram-desktop-bin-1.3.10.ebuild 1307 BLAKE2B fe5836e95483966f06590052aaaabbc7c2e669d4f1d9dfb4bb485163695b6a81b00d3bdbd9b295352db8ef5336de4e94e9e1f7bf6f1f0bec4b36a111baa37b4c SHA512 ef62500c548fda9943c225d976e90e71f48acadc700dbe93eacaf942e6762c9098f8d1944beab10cde4ef745127f00ce523fc3af0afd097aad7b4b1d369b65f7
 EBUILD telegram-desktop-bin-1.3.8.ebuild 1239 BLAKE2B 75378740e43e0a961e60044639c5cd123ec1f122a5f9b121b37e9274ca67e433123f2ceee991e17a145db256a75e0100ade3e4ff8e995af2756421c940da6b03 SHA512 16827af0caa76d6d3d913aebfc51588869f8e09257c6781b0b4a5f6aa9da641c323646517fa94604557554436347ce143b9cad31d96014057f48fa3cf6572304
 EBUILD telegram-desktop-bin-1.3.9.ebuild 1239 BLAKE2B 75378740e43e0a961e60044639c5cd123ec1f122a5f9b121b37e9274ca67e433123f2ceee991e17a145db256a75e0100ade3e4ff8e995af2756421c940da6b03 SHA512 16827af0caa76d6d3d913aebfc51588869f8e09257c6781b0b4a5f6aa9da641c323646517fa94604557554436347ce143b9cad31d96014057f48fa3cf6572304
diff --git a/net-im/telegram-desktop-bin/files/telegram-desktop-bin-r1 b/net-im/telegram-desktop-bin/files/telegram-desktop-bin-r1
new file mode 100644
index 000000000000..954b3bdeaea5
--- /dev/null
+++ b/net-im/telegram-desktop-bin/files/telegram-desktop-bin-r1
@@ -0,0 +1,9 @@
+#!/bin/sh
+# this wrapper disables the auto-updater of telegram-desktop
+# This program is licensed under the same license as telegram-desktop
+
+# telegram-desktop fails to set RestartCommand with the session manager
+# exclude it from session management to prevent restarts without the argument
+unset SESSION_MANAGER
+
+exec /usr/lib/telegram-desktop-bin/Telegram -externalupdater $@
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.10-r1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.10-r1.ebuild
new file mode 100644
index 000000000000..11ccb634fcf5
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.10-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+	x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.${PV}.tar.xz )
+"
+
+LICENSE="telegram"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+QA_PREBUILT="usr/lib/${PN}/Telegram"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	>=sys-apps/dbus-1.4.20
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10[xkb]
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	exeinto /usr/lib/${PN}
+	doexe "Telegram"
+	newbin "${FILESDIR}"/${PN}-r1 "telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram-desktop.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/net-im/tkabber/Manifest b/net-im/tkabber/Manifest
index 8f9d3f8979ef..0d65c2db1ddb 100644
--- a/net-im/tkabber/Manifest
+++ b/net-im/tkabber/Manifest
@@ -1,4 +1,7 @@
 DIST tkabber-0.11.1.tar.gz 1026405 BLAKE2B 2c8e5c5348ed9ba416b734a100488d24fff16f54ff6eea1156665be4247f0d66ff94411914053ea95e28bb03509708daf5d0497906a9d6c60c37457ce885aa6b SHA512 a28f4f9d2873366b4ffc6153e08d21e77dd0178fea13d894e79ce941779d8e4c97e48b572cbfd8c6c25c0636f6c8d8ca8d9b081aaccbb8e6d809de3228bdd268
+DIST tkabber-1.1.2.tar.xz 993640 BLAKE2B 5389c2e6eefe82cf1344edf833a8f1aa3b7dafb0db7ad0589ea8cf3f756e44e2527c71a90030e8694a7f6a09fadba4d05b7b79cea8deb82a5dd51d41ad3c36c5 SHA512 5626921c8bb5e847cfb35c7532202cf1181d6a8d67712b024a7d2d4c4fead0442c16381b1269c7e5ecd0dbd785ed2f541feaee3b09d067532d58d9ffa6bae392
 DIST tkabber-plugins-0.11.1.tar.gz 615335 BLAKE2B 7e288806f3d44cc23b4447fe5caeb4bd5458cbef3329e8e49f3dd0640caaa7cf3386cd66d67413fe8f6e4176ae15ff8d2d3412684eaa82edb50cea0af3796200 SHA512 f77e4a2a3f11629796c6bdcc5ee9a782cc42ca9a43d8a9033b260df7f6260549860b6d53095067e4c3da9a1733a0570656ab807ff7853a4573c2e7f68a497014
+DIST tkabber-plugins-1.1.2.tar.xz 669580 BLAKE2B c1f15a4b49621c121a56884747ecce810fea12a784b2a1c2353dc0e94666635c391bd9d66b196900e05bf798689e4a29fe9f738f949e4ad6734541700c4b8a80 SHA512 6af7287da59f426f84ee24a0722d91106d15f939e7102c289fbe9a396b5b1b96f4fc9c3e58ceba74c1722e91d09a920d2f8e574437c8fe97382e020a911d678b
 EBUILD tkabber-0.11.1-r1.ebuild 1085 BLAKE2B 54e615ad0006b014cbb12dd28fcd2c52af048224ecae5b46f1cc561b92bcea78c3e2fb4ec9d4fca2bd514d45dda80243e8d2e24b47addf2a47db354241134d3f SHA512 4ea78131bbc587c906991b704b07f330bbcdc244dd0ca91ff21122f43780817b4d0cc8a40fea3794f5616daa1cfe636dd8ba5db4fc226cbadc1eadabe383f95a
+EBUILD tkabber-1.1.2.ebuild 1179 BLAKE2B 4dcb52149b2cc9f818bb14387e4a63c04592ae1bfcf4f660eeb2de9cb68b9e58f18a200f5822f8861503ffe06f5a679a4b3a06be42cc7a95188c943f02736632 SHA512 25b53e5e8fd68fe0639d2b8f9e6c6221a75861c221a8a0e54f4fd6df842a390db00106dcccdbb2fc012e1a4c64ff96e522b613844d31e4a487d898bdec8f88fa
 MISC metadata.xml 416 BLAKE2B f6feee2856945bb8d9c98cf54011ec369c46f5816ac44c54db7fe4186b1f3082a150b20a6e9d54c8dbb10e94785ed754ee539e4a4d503e53aba097a38e69f030 SHA512 95bb361f0dd66f6a990fbfe5f0df70e281076d779a94ae434cc36800a010b665da66b73c05c9091c88cd139cd83363b15b95644f2b0caf020b91fa93ad6d5abe
diff --git a/net-im/tkabber/tkabber-1.1.2.ebuild b/net-im/tkabber/tkabber-1.1.2.ebuild
new file mode 100644
index 000000000000..1a3d4ecb6b81
--- /dev/null
+++ b/net-im/tkabber/tkabber-1.1.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A jabber client written in Tcl/Tk"
+HOMEPAGE="http://tkabber.jabber.ru/"
+SRC_URI="
+	http://files.jabber.ru/tkabber/${P}.tar.xz
+	plugins? ( http://files.jabber.ru/tkabber/tkabber-plugins-${PV}.tar.xz )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="plugins ssl"
+
+DEPEND="
+	>=dev-lang/tcl-8.4.9:0=
+	>=dev-lang/tk-8.4.9:0=
+	>=dev-tcltk/tcllib-1.3
+	>=dev-tcltk/bwidget-1.3
+	>=dev-tcltk/tkXwin-1.0
+	>=dev-tcltk/tkimg-1.2
+	>=dev-tcltk/tktray-1.3
+	ssl? ( >=dev-tcltk/tls-1.4.1 )
+"
+RDEPEND="${DEPEND}"
+
+# Disabled because it depends on gpgme 0.3.x
+#	crypt? ( >=dev-tcltk/tclgpgme-1.0 )
+
+src_compile() {
+	# dont run make, because the Makefile is broken with all=install
+	:
+}
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr" \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+
+	dodoc AUTHORS ChangeLog INSTALL README
+
+	if use plugins; then
+		cd "${WORKDIR}/tkabber-plugins-${PV}" || die "Couldn't enter tkabber-plugins dir!"
+		emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr" \
+			DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	fi
+}
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index e62862b8401e..def0edd63f9d 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,4 +1,7 @@
 AUX toxic-0.8.0-verbose-build-log.patch 9264 BLAKE2B c4e94a50711fc3804b11afb260ab82936d563b1bff3d87e106d5897d660b4138864dda1cd2f01d3d0a3a024efc731d4dc97008d0f4022e6124613ff141ea264a SHA512 5f3b1e2c20ff04b11ef40eee0953954c0274044aeefa4c4cde5fd4028591ebedc94d671383656d5af219e2d6ed9bf998ba092a821528e80f6617a4cb85ef003d
 DIST toxic-0.8.0.tar.gz 1145799 BLAKE2B 01dd14d28feac0aadd1e87d8538910601b532e8cb02219091a863502eb80f812a034eecf06f131ff878509dfc1eb40e5f9baf7547180346eeb03bdb7dea4a6ed SHA512 3c59edb61b1bcdbfa3a8391a1a1ceccc6c9c38b49c1709813d60480b180fb39607806116b9dcd1de35ebb02e23e95d78c8191f04a4875e06e27fa43bc9800b33
+DIST toxic-0.8.2.tar.gz 1146526 BLAKE2B 0a1c80313963287e88aa489ecf4614365a3d94c770cdfb3b1f3afd0bf2b70639c35b9c5ce52408647abdaac9822c9529b603ec1883779f5486ff63001d98ff5e SHA512 258e873404315c9a1f59d67f524089afebad88d800116bd9e53c8bc35bd9dd6b66cfcd90db06181f01330ba0a302456510fac5c01fdbfde7d475aa5d6b1070aa
+DIST toxic_patches-0.8.2.tar.gz 3859 BLAKE2B 4a19226cea6c7ce60f599fbd4f74171f26b3812259f0f8997997526bde7beb6fe64b922f25fe77e0ac8f9b185db116d2e626cb889631a1508786b92f9bbc8927 SHA512 737cc53e814567e10ad8b7431be63ab8f99b76bb150490c31e03309c4e51ee34a798d141cbde446cbbc4b5c0145ca468f3456a2af4b966c80792cdccc6562b46
 EBUILD toxic-0.8.0-r1.ebuild 2057 BLAKE2B 6758c830e8cf0f58d76c7e2a09d767aa4c5a94acdd082ffb10898c217db6c02d83ad2dbb51df571cbd246427ef1262506d99fe6aff086f7d76796f04f3ea7da3 SHA512 415e828401566250b63a95cd245b61b2237a2081737b6fb6860e031e331fdf309643ed8fc2982eae322d2c1a5bc48be97d49e369cf4a7cfb4f7f02ed8ac29022
-MISC metadata.xml 782 BLAKE2B b16c2b1eb3bfbab3f58868edb8d3a3ab587563fc2b57b00d28be50d6380dba3ffed70d43ebb1d44b51a319aa93540cc88c59cf78bfb3582b91100e2fd4847357 SHA512 77c3aeaef93ed547c02d66f9856ed6c34d3937133831296d0e0abee713634216045d08ba43fcfa303747bb65f4fe1574962e6ccc10aff46642b5fc7c8e2c0caa
+EBUILD toxic-0.8.2.ebuild 2259 BLAKE2B e71336c2ba6967780dbfcb4ec865429955d513679197f3e59ca4ba7277010a9b41cdcccb45c7d5771c3b379170f86d6d611cc3d80e3aafebd5ba7dcf3e86d069 SHA512 3864d5b5de55b14e0a1786229fc6a61611d137c8f9b9c832898dc6865de683d77f34866141ae8111118e5af4e23ab96bbeaaaf071a268d0c2c8e7c5f8c3740ba
+MISC metadata.xml 933 BLAKE2B a91cff36d985a0f854b7eda20c7746f87b4b4bd8a64b6d03fa8f6fea655378e05d899a6769362408b800b0ede3e2177d3d7c6d64fe0d78642ded3a789afe52a7 SHA512 9e45ea9ceb2cac0adbe27eecf4d470abaaab588d805c4db9ffe3b2f72801a38291e145a017e4202313da8888f8279de1a410a0676b615de4827e50fde2ec2f64
diff --git a/net-im/toxic/metadata.xml b/net-im/toxic/metadata.xml
index 7982519991a9..d4103ec575aa 100644
--- a/net-im/toxic/metadata.xml
+++ b/net-im/toxic/metadata.xml
@@ -14,8 +14,10 @@
 	</longdescription>
 	<use>
 		<flag name="audio">Enables audio calling</flag>
+		<flag name="notification">Enables desktop notifications with libnotify, with sound support.</flag>
 		<flag name="notifications">Enables desktop notifications with libnotify, with sound support.</flag>
 		<flag name="qrcode">Enables QR code support</flag>
+		<flag name="sound">Enables audio calling</flag>
 		<flag name="video">Enables video calling</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-im/toxic/toxic-0.8.2.ebuild b/net-im/toxic/toxic-0.8.2.ebuild
new file mode 100644
index 000000000000..ac48eccb5065
--- /dev/null
+++ b/net-im/toxic/toxic-0.8.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+
+inherit python-single-r1 xdg
+
+DESCRIPTION="A curses-based client for Tox"
+HOMEPAGE="https://github.com/JFreegman/toxic"
+SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/fx-carton/toxic_patches/archive/v${PV}.tar.gz -> ${PN}_patches-${PV}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+X +sound notification +python +qrcode +video"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Not a typo; net-libs/tox only has a 'both or neither' option
+RDEPEND="
+	net-libs/tox:0/0.2
+	dev-libs/libconfig
+	net-misc/curl:0=
+	sys-libs/ncurses:0=
+	notification? ( x11-libs/libnotify )
+	python? ( ${PYTHON_DEPS} )
+	qrcode? ( media-gfx/qrencode:= )
+	sound? (
+		media-libs/openal
+		media-libs/freealut
+		net-libs/tox:0/0.2[av]
+	)
+	video? (
+		media-libs/libvpx:=
+		net-libs/tox:0/0.2[av]
+		x11-libs/libX11
+	)
+"
+DEPEND="
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${WORKDIR}/${PN}_patches-${PV}/${P}-make-qrencode-optional.patch"
+	)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} = 0.8.2 ]]; then
+		sed -i \
+			-e 's/^\(TOXIC_VERSION =\).*$/\1 0.8.2/' \
+			cfg/global_vars.mk || die
+	else
+		die "Remove stale version hack"
+	fi
+	sed -i '/^VIDEO = /s/DISABLE_AV/DISABLE_VI/g' cfg/checks/check_features.mk || die
+	find . '(' -name '*.mk' -o -name 'Makefile' ')' -exec sed -i 's/^\t@/\t/' {} + || die
+}
+
+src_configure() {
+	export USER_CFLAGS="${CFLAGS}"
+	export USER_LDFLAGS="${LDFLAGS}"
+	if ! use sound; then
+		export DISABLE_AV=1
+		export DISABLE_SOUND_NOTIFY=1
+	fi
+	if ! use video; then
+		export DISABLE_VI=1
+	fi
+	if ! use X; then
+		export DISABLE_X11=1
+	fi
+	if ! use notification; then
+		export DISABLE_DESKTOP_NOTIFY=1
+	fi
+	if ! use qrcode; then
+		export DISABLE_QRCODE=1
+		export DISABLE_QRPNG=1
+	fi
+	if use python; then
+		export ENABLE_PYTHON=1
+	fi
+	sed -i \
+		-e "s,/usr/local,${EPREFIX}/usr,g" \
+		cfg/global_vars.mk || die "PREFIX sed failed"
+}
+
+src_install() {
+	default
+	if ! use sound; then
+		rm -r "${ED%/}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
+	fi
+}