gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /net-im
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
45 files changed, 1253 insertions, 148 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 0ff976764b04..d1532e6f0dca 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/coturn/Manifest b/net-im/coturn/Manifest
index a285bd1e166d..10891a2ac101 100644
--- a/net-im/coturn/Manifest
+++ b/net-im/coturn/Manifest
@@ -3,6 +3,8 @@ AUX coturn.service 470 BLAKE2B 21b1cc005b5b91a8cb80b05a45afc16d73ad88e5b0a851294
 AUX logrotate.coturn 345 BLAKE2B 26edd2ad44d947bf943757fb3e3255cafea64fac5d495402bbc3a7088ed6ffd822cc8f07010669f9faf856eb8a893d9ba9ab48d4b417f8c3fd27772ffb71cae0 SHA512 ebfadc7e6435061b7120baffce76a65c224768ab85e59e3b8cd140e394fa6e4eaa258eccce76f3152fd6a1adab0c84e39feb51663c76359401e04df4d8db2c1d
 AUX turnserver.init 636 BLAKE2B b73a5c43ea89243a77039688822f8188cef1d49f5b9ba7aaf95516ed08f9fe7ba876083c556dd8a58d2c79b0c9b1d28039f2e1893ffd58b1f1b8508f5f7903b3 SHA512 bdfad74908009edce899298aca755cead6bcab77663893d0fb4c83134d5d5eb569493be6ae39c4654ddb0079d6bfa259e3932fbb275eae8f6af13c7c197776a7
 DIST coturn-4.5.0.7.tar.gz 396579 BLAKE2B ac66fbac772ad4b182f0c4b64178a780bfb364e4c1cf105fc340ac60da0a4c2e2b186c3ce08cade347a5d1a4b233bfed604db74eacd81967c3090e00bc1e36e8 SHA512 4e6e4efb456449752b2cd242c9be7c5dc2298472e338293d3de21c3a9da968f2f304625663372bb4d857c092c694aa4681630773a46e4928b9c60c69378adacc
+DIST coturn-4.5.0.8.tar.gz 403711 BLAKE2B 1bc6a145117ffb3a5ea7d6730524d0ad8857755a3d8a59588ec61df9fcf21c1c68a15efb588c73f659c4e855cb7fdce145a83a8a0e10c0bfae2d0a54d1120475 SHA512 2bf32f72223bcb1ee57254def423a6f6d385df8e20661f79a789b08324d432269eeeb4a6a551769f1f9147447bcf1b4471fc634e9d91ca979947119ae76cec9e
 EBUILD coturn-4.5.0.7.ebuild 1929 BLAKE2B c5a52b53da3a986076af1c9b79ec4d5ca83199b058b4bfedf855fb7498b799bfa5f4a29f337b6a4bfc9830aa7808be3d12267f43f38861c4163f175771e013f2 SHA512 30cdbe95fbcf2e17979c898c132835928b6508e96fa4f372015e5048bf14cadd0000317cfbdf403023361bda8045177b7e89d55e607e9aa6d7e0450f10ac7c00
+EBUILD coturn-4.5.0.8.ebuild 1926 BLAKE2B 824aece8466077659677411a9c4b9a8829bab5f6a09211b032b8750adf60b12acee5a3cab514aff5e205ba478fb1f02101c6ff567e20a61ce7b7fe301df82eaf SHA512 952c7400c2b684d6eb752a4452e355b213aa7d5afde223066ed36da49f01685ae0f5a341b137b7fd488b15c2237ffa0c8bfae3745ca42de4d9e86930e8219e7d
 EBUILD coturn-9999.ebuild 1929 BLAKE2B c5a52b53da3a986076af1c9b79ec4d5ca83199b058b4bfedf855fb7498b799bfa5f4a29f337b6a4bfc9830aa7808be3d12267f43f38861c4163f175771e013f2 SHA512 30cdbe95fbcf2e17979c898c132835928b6508e96fa4f372015e5048bf14cadd0000317cfbdf403023361bda8045177b7e89d55e607e9aa6d7e0450f10ac7c00
 MISC metadata.xml 497 BLAKE2B 522928095883e077064a9971e45e4e644461ce6d7a07720920a7bc96afc326b6ab337aa64704518a866f0df276f5bc284660e81561874631ff84c395035051dd SHA512 62689abd67427c6dd3de86c139b2cb94f7dc3ba8c8f9d3fced5b91b6de36cd30caa1a7805c0dc3aa64fa35e154e4509a607ef7eae62fe6894084383b2226b8bb
diff --git a/net-im/coturn/coturn-4.5.0.8.ebuild b/net-im/coturn/coturn-4.5.0.8.ebuild
new file mode 100644
index 000000000000..029e6d5d704e
--- /dev/null
+++ b/net-im/coturn/coturn-4.5.0.8.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils user systemd tmpfiles
+DESCRIPTION="coturn TURN server project"
+HOMEPAGE="https://github.com/${PN}/${PN}"
+
+if [ ${PV} = 9999 ]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+	DEPEND="dev-vcs/git"
+#	S="${WORKDIR}/${PN}-master"
+else
+	KEYWORDS="~x86 ~amd64"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="mongodb mysql postgres redis sqlite"
+RDEPEND="|| ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] )
+	 mongodb? ( dev-libs/mongo-c-driver )
+	 mysql?  ( dev-db/mysql-connector-c )
+	 postgres? ( dev-db/postgresql:* )
+	 redis? ( dev-libs/hiredis )
+	 sqlite? ( dev-db/sqlite )"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	sed 's:#log-file=/var/tmp/turn.log:log-file=/var/log/turnserver.log:' \
+	    -i "${S}/examples/etc/turnserver.conf"  || die "sed for logdir failed"
+	sed 's:#simple-log:simple-log:' -i "${S}/examples/etc/turnserver.conf" \
+	    || die "sed for simple-log failed"
+	if ! use mongodb; then
+		export TURN_NO_MONGO=yes
+	fi
+	if ! use mysql; then
+		export TURN_NO_MYSQL=yes
+	fi
+	if ! use postgres; then
+		export TURN_NO_PQ=yes
+	fi
+	if ! use redis; then
+		export TURN_NO_HIREDIS=yes
+	fi
+	if ! use sqlite; then
+		export TURN_NO_SQLITE=yes
+	fi
+
+	econf $(use_with sqlite)
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/turnserver.init" turnserver
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate.${PN}" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	dotmpfiles "${FILESDIR}/${PN}.conf"
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+	enewgroup turnserver
+	enewuser turnserver -1 -1 -1 turnserver
+	elog "You need to copy /etc/turnserver.conf.default to"
+	elog "/etc/turnserver.conf and do your settings there."
+}
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 04dc41218863..c3d51ad3df3a 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -13,7 +13,7 @@ DIST ejabberd-16.09.tar.gz 1687485 BLAKE2B 01bdfc0ebfc54bf94f5ce645fdb7e4c860702
 DIST ejabberd-17.01.tar.gz 1638418 BLAKE2B 016224277c45f753018a4e82783be1924acc1e747f1674ce1c902b06644908762750770debe5c06e8e4befcb4246b65efed4592d948188c30dcbf158bb049688 SHA512 d64125f81efbf841eded140d877c950439c11e65377e167994d25f85fa66437aad771d94548d063900bd3c472922e6bfa8f8bbe65413f18e7b641f0ed32db566
 DIST ejabberd-17.04.tar.gz 1690441 BLAKE2B 2d31f1f0a393c6531653a55021b9deb729357bb53e86e85b85796a65f505257bcf7a14b0d168af2d13a6820e1524e1164ea7f17797df23ae41d7a8379f9e2066 SHA512 03467434dba92bd1ff2f70d78aa8fcf86fc73cb52aaaa73e4947229e1d14225e7b0d0133c3da7c8efe4c9db13aab932f40f757be46b120d0f280f96d62c203d7
 EBUILD ejabberd-16.09.ebuild 10410 BLAKE2B 5f0e00b9c106afd09dad578411c0e7ff7ec982db5184ec539ae532293c84db06a4b73ce382a3c633bcf0041c7a613b9e1403e9ecfa3196f18b2b9a5c2d372021 SHA512 474c1effa517a9a21866d78362bf915f8377d7e331190a0e2ef6408c5fa9f758b2e0a8917de9106ac56a06ea6953c3786e225164e154197aaaa976cb46686491
-EBUILD ejabberd-17.01-r2.ebuild 10586 BLAKE2B 7c3fb4e4a3cc06877e405747396f166f135ec4db8c7a2c38658fbc1759c12d24a8f7d8a83beb33848e5cf4a20e9d7994e58dcbad314391946710bce35a2fdcb2 SHA512 08d6784ad37852d3c929db73b1ab6be2ee347dda0419791d766e97ad663bd0eb1b2324b59bb9698306c6ea7349fd41124ec173e15a11bd67c44cefd223351073
-EBUILD ejabberd-17.04-r1.ebuild 10655 BLAKE2B dd124adbf6bee8e6824a36cdce3de21fd585fbe257b4ac9ced1e23b56fdb941070381ed1f4996e591d5741f8e9b69d23dbcde37378eb39077963f29d899818db SHA512 3f95cc09543d2a54c9df66311017fa5a5c23651143482632bf42fe7c13077b2fb6e6fde3ac01bbbaa9286421f2ca52b6e1803c39986bdd32f8459182d0b4b80b
-EBUILD ejabberd-17.04-r2.ebuild 10886 BLAKE2B 04891c6fffe52be31c30a1b93a501b49029348cb38f12e0c7cd2d774b98d07723901f43a0614d45b4e40040385dc9ae59aac0d753b9804a7c397d737a91ec8b9 SHA512 f40aa10783c1d9470ed5635c28be2b9833c177701ff13808aa7443b3d4f953b9e429ea513d6fb0ad15bc356437fc617f1e8c6876642f5538f6f92cf1bdda7296
+EBUILD ejabberd-17.01-r2.ebuild 10610 BLAKE2B b8488e6546001b91deb8ded9ae3b7cdbf81303153f467c8ca1beb17bdbb56178324349c0f6f484c9dbc3307c8a238a1da874638361ce5043d5097e5eef932309 SHA512 9309a91a1a4103c54d81574b4aebcda7c5174e36833154f31698e86d1ce178a13c803cadf55d3ccaaeb6ab32194d228798ec655e2de183d916baef1213306f8a
+EBUILD ejabberd-17.04-r1.ebuild 10679 BLAKE2B 4243dfc06ef33e41eb77ec529cc98bbe86003cf7bf2e383624c279678dc71351b6a2d34d46ccb91004e324b805100cc180233552a98637af611f2ce9bfa78f7d SHA512 b21e8022f7ee1024c3bae79af80c8a683db4b40974230b194e19910944d74b9dec9b74e020967dfe960b7c27b2fdd2e7e70e9ff86d2052133e1d241954c23798
+EBUILD ejabberd-17.04-r2.ebuild 10910 BLAKE2B 8a5d34ca8fd943b604d07b9e6ca9aa092a40064b67a03ed58fc1fd4a74b626e3073cbb22d3ed4effb9e594f2e3c1a36ac63078dfe8b9b066bd7b7d9a5d1c7b2d SHA512 0b6d08ef700f1d721d436858f24505e8304733346a49dbe84252f4b69fe359aa505f2f888d4538c035c15704c477fe884904c64ef414648f18811f3e2de8dfc1
 MISC metadata.xml 1722 BLAKE2B b88f8d75b4e5ce0a61e7fbc2402d8c7f8e7976965fb0cd7f933d2a4136e378ad79bfef107b8e557c383ef84d4fee38ff3d670c3aae6815a457c649083e1590a3 SHA512 943a50b2d49defcb82428ec1470bf05e890a4c753463da857fca4cb01fdb032aade634c69f9ebf4c3b7cf1023ed9bc2c11e7aa94e8cfed57af1a5dc328bb5d78
diff --git a/net-im/ejabberd/ejabberd-17.01-r2.ebuild b/net-im/ejabberd/ejabberd-17.01-r2.ebuild
index 2d05543a5718..d20acca57feb 100644
--- a/net-im/ejabberd/ejabberd-17.01-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-17.01-r2.ebuild
@@ -41,6 +41,7 @@ CDEPEND="
 	>=dev-erlang/stringprep-1.0.7
 	>=dev-erlang/stun-1.0.9
 	>=dev-erlang/xmpp-1.1.6
+	<dev-erlang/xmpp-1.2.0
 	>=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
 	!>=dev-lang/erlang-20.0
 	>=net-im/jabber-base-0.01
diff --git a/net-im/ejabberd/ejabberd-17.04-r1.ebuild b/net-im/ejabberd/ejabberd-17.04-r1.ebuild
index 49ecf5359e3a..02947b6b7391 100644
--- a/net-im/ejabberd/ejabberd-17.04-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04-r1.ebuild
@@ -41,6 +41,7 @@ CDEPEND="
 	>=dev-erlang/stringprep-1.0.8
 	>=dev-erlang/stun-1.0.10
 	>=dev-erlang/xmpp-1.1.9
+	<dev-erlang/xmpp-1.2.0
 	>=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
 	!>=dev-lang/erlang-20.0
 	>=net-im/jabber-base-0.01
diff --git a/net-im/ejabberd/ejabberd-17.04-r2.ebuild b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
index 1c5c02166647..6a2041af6c58 100644
--- a/net-im/ejabberd/ejabberd-17.04-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
@@ -41,6 +41,7 @@ CDEPEND="
 	>=dev-erlang/stringprep-1.0.8
 	>=dev-erlang/stun-1.0.10
 	>=dev-erlang/xmpp-1.1.9
+	<dev-erlang/xmpp-1.2.0
 	>=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
 	>=net-im/jabber-base-0.01
 	ldap? ( =net-nds/openldap-2* )
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index b6f4267f345a..47d9160c3fe5 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,6 +1,6 @@
 AUX 0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch 2104 BLAKE2B 5108a1d471b78b5d5ca66d2979d286013457c014adb37e58514c2997dd1d5a3f131c9dee46a9dce3011701e802c23d40d0e0ccac0d2a473e10b5b321b504b681 SHA512 a9b8c351633aafcc881a4949e72e0ecd89314a93a3a011dad643ff0a64f208654961218e7d7e69af4ae76824d7de88dec3a572cc08aa6338bafa672ef07e4434
 DIST gajim-0.16.6.tar.bz2 4564505 BLAKE2B 0446d826afc782ceba4fe67d6c7173d60264ec1b5a227f0da62285ea1d083143b4895e4472c2df499de419f9a34c59d9afa1ac2348052defb100438782a3df46 SHA512 6c8c2a38429468a1e6f02aae730ff947c649960e8cc672457c1e1733ab2dad6534b1e5ac2e1c0c385e331a6ba817c6e67c1a27443632b9fd43e7ab76ad66c935
 DIST gajim-0.16.9.tar.bz2 4469275 BLAKE2B 451f09cde9d177932429b9ece900e09c58ac43b5f97cd64cf70e75d13f2261ab52ee35e02e8680c83a5d81d7574bca561532dd1327f1109b0cc872956b1a05f7 SHA512 d8ddae3826bbcd4458b016b3cf6b0472b41db4b9026b300b058d9cef403195e38423ff950fcbf6fed0cdbbb485a274905a9a5945028c4cbb24d1a38c72bf4cbb
-EBUILD gajim-0.16.6-r1.ebuild 3013 BLAKE2B b5dfbb6985a95709ce14919f17e0589b657c800737b7484b050a57220cd00947ac8ed7b4e6f827eecbd4588b0fdc65d79f5965fccb7955cec6ea3d9f10c77a25 SHA512 5e94a24544c5f50adc0f44f152c6fdda300a954fc62c8518f958f6c9613742ba1d856ed973b0503b6c1eae962fde7170b69d357d8a57a361705ab6fcee751648
-EBUILD gajim-0.16.9.ebuild 2933 BLAKE2B e45cd38257e17f94eb2fbe8363ca0a60bd72c6ca07af3fe1781efb86efe559c6f0a84e82de109c0a99b25ad52894ed0ebc2925fd41e8a20ed0aed6bedc772ece SHA512 db45b07d17e81a8cdb85c262923bd1223dbde9a57e5e6b38e4747da1e53e6d5f6a02b164a738618855391376391d2c3f91375d8288c5ba9e987f0abcfa3ba268
+EBUILD gajim-0.16.6-r1.ebuild 3006 BLAKE2B 70c874dcacc3122ce27e3bf2b3b90581c83935b149b8b183f24a573b6fd37bddf0f001b1bb9c1a002e0d0222da120a5ee6ad828be38ef41d3bd1c70729924465 SHA512 a8262488317680b97871026f3aa27744646011ad5db1e37aab63d1dd6e1d8ad66dc4bf9199124159370d85e9475adf284872ef42765d1386a56a247ae4cb3be8
+EBUILD gajim-0.16.9.ebuild 2925 BLAKE2B b620ea38f3cb316c3b81d8d0f96e3f2e60d2895e7a55d215392a0207e92081a753b601764ec8dbeeb91ec463fd8916bc0d18e7f346d2db05f8887758d7839cbb SHA512 80d3ff43100a87ba1a933ac4374d5a1182deb9c03505ba17ed0fc506b7f18583f0de0cb400cacea13291c83c5a4a30ed369cf8b15d8f02cab1d91cb2bbe52275
 MISC metadata.xml 498 BLAKE2B c86a12d54b4eaed630cc03515a7574c3c311cf6e9420c9e0e20b11777e0f0f23246b52832fc882c700f9311cf1502b8ddc1187828a32e2fba334da686a932607 SHA512 f275f9e7d3f4661dd2272a4e2664598f93bf68f008705168a191dacbceca64f0d3c357234a325dbbbc8d8f851ef642f3e5619c30671c71ff9b8b939ed7e6231c
diff --git a/net-im/gajim/gajim-0.16.6-r1.ebuild b/net-im/gajim/gajim-0.16.6-r1.ebuild
index 8d50c46e7c98..f8bda52c4215 100644
--- a/net-im/gajim/gajim-0.16.6-r1.ebuild
+++ b/net-im/gajim/gajim-0.16.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf"
 
 REQUIRED_USE="
diff --git a/net-im/gajim/gajim-0.16.9.ebuild b/net-im/gajim/gajim-0.16.9.ebuild
index 50310bd2ec5f..2285e709078d 100644
--- a/net-im/gajim/gajim-0.16.9.ebuild
+++ b/net-im/gajim/gajim-0.16.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="crypt dbus gnome gnome-keyring idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf"
 
 REQUIRED_USE="
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 7bd57c8e3901..fc8d10b00201 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -4,7 +4,11 @@ AUX prosody.initd-r2 1067 BLAKE2B 64293637d5afaa5805cdfe3f2083aaa25fcd1611ce6dfe
 AUX prosody.service 275 BLAKE2B f1d889d59f507c990f0dddd8811465e2729fd4d7acde83204a0976affe8471707a64eaaeab31f458e526cebd7860aa470738008682a8e4363f86092f96d60d74 SHA512 0e16a20363aa13eb48bac2a60be6308f56501835dad021de5492aee80ec31bdda044928b76ef50ad359bc1e0d0593f15ff47ea683a345fef4bde2602a2da0f6c
 AUX prosody.tmpfilesd 38 BLAKE2B adf773737f29277af7940129ba41bcd48481ae053858b72b9a308fcb2a29e56cfb534d3b147ce4962a5aa62a52873245be622c800f1b1a8b714890f359a625a3 SHA512 a3e067a905b3f0221077fee7d2acb709082e464892981fac316e5fde204150ab922e76ead75881c0f1aa925219d62b966756f75dc68406d8af27f7cd883dd4bc
 DIST prosody-0.10.2.tar.gz 331874 BLAKE2B 0e0af95a9168810263e6f60b825393d1088f69dba1faabf6c0c9dda3ef6b039a92f7edb9643cb9a60a3131a64038de5c3598f7076837b58ad196ac03fa98bfc4 SHA512 9fc05e34b45b0c16835ba94a73532fb3b4ee335f27d56bb9260e1b3e22614f89f44eb5d04b4e90d016db0b5bee6f5c7e7d099e1defb027e6823ee7667c1fe28f
+DIST prosody-0.11.0.tar.gz 418710 BLAKE2B 2a9af1edbd77d3ef8f629ed5855a6638929bd0476d5245c0ef3ec6e2d840fda3a8b733bcfe35b7603057caa23576e0ec344d244d0c1678e28aa41badb75b6170 SHA512 292f555a25108716cd3ceb8ab39210bcb7f2fd113bd844092a51f68127e59b64ec76045740fd93edca8be2c1711a5fbab0f51a285f3ab78d36423a897ea667bf
+DIST prosody-0.11.1.tar.gz 418780 BLAKE2B 0fa45b71bb7eeaa60385683427c9547af3e014faa97dec409cc19e48bfd1b91fec7eb001fb14a86c9f3ce2c653ece2fdb113bba860cdc500cb164dd7749af6cc SHA512 6e25d2365d40582f57799bb08bf2673ba43270e8bcca5c5b785381380db55ec3ea6ab771fb9bd228bf265a564bb017dbfeae81713abd2de35a92704f8b8004ef
 DIST prosody-0.9.14.tar.gz 268253 BLAKE2B 0ae62ca3c8eb89feb34f1f67aa3d14aa1e6bf02cf10ff90a43fd7de8bd257d70508e36b10b3f159040c1fa5dcfb6ad8018e3411a5d6042992f71f643a13c11d4 SHA512 30116ebc20c719d88bae7f2f44c129604ec4477004581c3556ff548c75ee026a83dc519701a61a8c3f547776ba74c571e38c3e1e5240da9148dad35a5d1f67e3
 EBUILD prosody-0.10.2.ebuild 2484 BLAKE2B 39490d068e3554d75d8651258c8cee1307f419bd3b3b2f1f597bd9ef3adf0a59c879818d91e4652ce43c19a3c3e391339711409b5b58af748025004db8dfa39a SHA512 45bc465b096e0f2083c3b36faa3ddcabfa65b100014abc020efb8d81e7939be7d52c9d80defe58bcc51139021dfd8ed1205a8d0a0d82b641ed8b870ea0236505
+EBUILD prosody-0.11.0-r1.ebuild 2602 BLAKE2B 4fdc94ef19de23f6dbabde397206b45b7f62c3c75c855165aef974c2f7b3daa8f6a894b0a0a1ba899325ade47369bdf4e9c69a2139826c3774fdc09353c9d007 SHA512 d026e19e954b8d414657f50814ed636cd84b7a7bdec7e57db5a5471711ec5de327300fa3a6a9177ee3cebb3ded684e241b986b268e442f74bbe5b9724af4b97b
+EBUILD prosody-0.11.1.ebuild 2602 BLAKE2B 4fdc94ef19de23f6dbabde397206b45b7f62c3c75c855165aef974c2f7b3daa8f6a894b0a0a1ba899325ade47369bdf4e9c69a2139826c3774fdc09353c9d007 SHA512 d026e19e954b8d414657f50814ed636cd84b7a7bdec7e57db5a5471711ec5de327300fa3a6a9177ee3cebb3ded684e241b986b268e442f74bbe5b9724af4b97b
 EBUILD prosody-0.9.14.ebuild 2487 BLAKE2B 68ff4e360612ff9aef0cba3556b6c3fbe69d261ddad40f24ad2a88e3adb4d6d3e119e011a4186412531ba23a6f98692550e4181084e63e201cf9f753080c6427 SHA512 c28fec41e3a57e76a32c9a5c380804d904a0a9f76dd66b4bb183ba2eb6a705957c54bef760bec723277ea234c6c5f2d12b899de11126962c3c77c75f95a9f1e6
 MISC metadata.xml 624 BLAKE2B 57704d2f82f7b7daa34d7114d375591cffe12a3cfd396a95ea61c76f644750cd92567d5619133bebd56ff2f302c3f576aca22abcc954641c89757e85e35ae0b6 SHA512 0410e3372d04163cc8b5e03d95f5c0c7e7e6da4e6034adfd86700455c6662d844e8da5590dbd5a633179dd8c3da15760b49d3068787ed61833c9031cec341a24
diff --git a/net-im/prosody/prosody-0.11.0-r1.ebuild b/net-im/prosody/prosody-0.11.0-r1.ebuild
new file mode 100644
index 000000000000..eccd2e1da7be
--- /dev/null
+++ b/net-im/prosody/prosody-0.11.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib systemd
+
+MY_PV=$(ver_rs 3 '')
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
+HOMEPAGE="https://prosody.im/"
+SRC_URI="https://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl"
+
+DEPEND="net-im/jabber-base
+		dev-lua/LuaBitOp
+		!jit? ( >=dev-lang/lua-5.1:0 )
+		jit? ( dev-lang/luajit:2 )
+		>=net-dns/libidn-1.1:=
+		!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )"
+RDEPEND="${DEPEND}
+		>=dev-lua/luaexpat-1.3.0
+		dev-lua/luafilesystem
+		ipv6? ( >=dev-lua/luasocket-3 )
+		!ipv6? ( dev-lua/luasocket )
+		libevent? ( >=dev-lua/luaevent-0.4.3 )
+		mysql? ( dev-lua/luadbi[mysql] )
+		postgres? ( dev-lua/luadbi[postgres] )
+		sqlite? ( dev-lua/luadbi[sqlite] )
+		ssl? ( dev-lua/luasec )
+		zlib? ( dev-lua/lua-zlib )"
+
+S=${WORKDIR}/${MY_P}
+
+JABBER_ETC="/etc/jabber"
+JABBER_SPOOL="/var/spool/jabber"
+
+src_prepare() {
+	default
+	rm makefile && mv GNUmakefile Makefile || die
+	sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
+		-e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
+		-e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\
+		-e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\
+		Makefile || die
+}
+
+src_configure() {
+	# the configure script is handcrafted (and yells at unknown options)
+	# hence do not use 'econf'
+	append-cflags -D_GNU_SOURCE
+	./configure \
+		--ostype=linux \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--sysconfdir="${EPREFIX}/${JABBER_ETC}" \
+		--datadir="${EPREFIX}/${JABBER_SPOOL}" \
+		--with-lua-include="${EPREFIX}/usr/include" \
+		--with-lua-lib="${EPREFIX}/usr/$(get_libdir)/lua" \
+		--runwith=lua"$(usev jit)" \
+		--cflags="${CFLAGS} -Wall -fPIC" \
+		--ldflags="${LDFLAGS} -shared" \
+		--c-compiler="$(tc-getCC)" \
+		--linker="$(tc-getCC)" || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	systemd_dounit "${FILESDIR}/${PN}".service
+	systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
+	newinitd "${FILESDIR}/${PN}".initd-r2 ${PN}
+	keepdir "${JABBER_SPOOL}"
+}
+
+pkg_postinst() {
+	elog "If you are using the MySQL backend, you need to update its schema:"
+	elog "https://prosody.im/doc/release/0.11.0#upgrade_notes"
+}
diff --git a/net-im/prosody/prosody-0.11.1.ebuild b/net-im/prosody/prosody-0.11.1.ebuild
new file mode 100644
index 000000000000..eccd2e1da7be
--- /dev/null
+++ b/net-im/prosody/prosody-0.11.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib systemd
+
+MY_PV=$(ver_rs 3 '')
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
+HOMEPAGE="https://prosody.im/"
+SRC_URI="https://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl"
+
+DEPEND="net-im/jabber-base
+		dev-lua/LuaBitOp
+		!jit? ( >=dev-lang/lua-5.1:0 )
+		jit? ( dev-lang/luajit:2 )
+		>=net-dns/libidn-1.1:=
+		!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )"
+RDEPEND="${DEPEND}
+		>=dev-lua/luaexpat-1.3.0
+		dev-lua/luafilesystem
+		ipv6? ( >=dev-lua/luasocket-3 )
+		!ipv6? ( dev-lua/luasocket )
+		libevent? ( >=dev-lua/luaevent-0.4.3 )
+		mysql? ( dev-lua/luadbi[mysql] )
+		postgres? ( dev-lua/luadbi[postgres] )
+		sqlite? ( dev-lua/luadbi[sqlite] )
+		ssl? ( dev-lua/luasec )
+		zlib? ( dev-lua/lua-zlib )"
+
+S=${WORKDIR}/${MY_P}
+
+JABBER_ETC="/etc/jabber"
+JABBER_SPOOL="/var/spool/jabber"
+
+src_prepare() {
+	default
+	rm makefile && mv GNUmakefile Makefile || die
+	sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
+		-e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
+		-e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\
+		-e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\
+		Makefile || die
+}
+
+src_configure() {
+	# the configure script is handcrafted (and yells at unknown options)
+	# hence do not use 'econf'
+	append-cflags -D_GNU_SOURCE
+	./configure \
+		--ostype=linux \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--sysconfdir="${EPREFIX}/${JABBER_ETC}" \
+		--datadir="${EPREFIX}/${JABBER_SPOOL}" \
+		--with-lua-include="${EPREFIX}/usr/include" \
+		--with-lua-lib="${EPREFIX}/usr/$(get_libdir)/lua" \
+		--runwith=lua"$(usev jit)" \
+		--cflags="${CFLAGS} -Wall -fPIC" \
+		--ldflags="${LDFLAGS} -shared" \
+		--c-compiler="$(tc-getCC)" \
+		--linker="$(tc-getCC)" || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	systemd_dounit "${FILESDIR}/${PN}".service
+	systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
+	newinitd "${FILESDIR}/${PN}".initd-r2 ${PN}
+	keepdir "${JABBER_SPOOL}"
+}
+
+pkg_postinst() {
+	elog "If you are using the MySQL backend, you need to update its schema:"
+	elog "https://prosody.im/doc/release/0.11.0#upgrade_notes"
+}
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 77565dc586ae..84aaa0214258 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.16.3_amd64.deb 72171054 BLAKE2B b488ba95dcd26b87582c41cc51433b46ab9dcfcce4cbe002c87e9cee5b5d07c554093aab5b9b2cae42621bcaa8c63ae2d39e4f362a77f5292bc9786b1d76e920 SHA512 62bd8b6608c48b8a57471fd9aa5d2662634697aae7e9244c841d729fe8c25f18a2362593fcc522d97adce894209c4dac9379facd1b58b1dd380bb061cd08c4a6
-EBUILD signal-desktop-bin-1.16.3.ebuild 1357 BLAKE2B 509b1674cbd0bb0bc6cab228c839b3b33d380c00c378a832fc0966cfd7a5051095a1ac5908b3796fa3d261f14d44ab8da1e256d98f57de0630dbd420b2e35b00 SHA512 9938eb393fbbedb8568159cf252aa7c8f0073d373e4f092840c874774f8a660fd76e955e5db59d0b9f25aefa047512f522200d2cf3f8e8bbb4729d5c470af7c3
+DIST signal-desktop_1.19.0_amd64.deb 74293630 BLAKE2B 44b145c422b91732486d2917efbf3daed2106fbb0e7361c320e8d73aeb5fd1e0112a56594ce2b33679dc58dc94d619eb322fc68620b166a9800f093b968fd0e6 SHA512 5530a07ec91843b417c458f06b72791a0c9a84593f20074a5a19bfbb81ee5eca7eadcb8a6639f53b3e95d43b9eeb76438b4468d744ec9f71f2b88df0473422e7
+EBUILD signal-desktop-bin-1.19.0.ebuild 1357 BLAKE2B 509b1674cbd0bb0bc6cab228c839b3b33d380c00c378a832fc0966cfd7a5051095a1ac5908b3796fa3d261f14d44ab8da1e256d98f57de0630dbd420b2e35b00 SHA512 9938eb393fbbedb8568159cf252aa7c8f0073d373e4f092840c874774f8a660fd76e955e5db59d0b9f25aefa047512f522200d2cf3f8e8bbb4729d5c470af7c3
 MISC metadata.xml 510 BLAKE2B 618fc8fb3b176d175bb15ceef941c60ebd89666f4b01f7b7912a4c26d8f54802982a8c089480f11573418daf88fb559dacca797c7f42493d122fd448c53eb923 SHA512 9d9ae0f5f1961fc1ad9b0e59f8d2003fc746f6f25dabb6c35b6ee8e151caf25e724b321e0c11a1b02f5431a204215caf5a4614232508b8492a0d33cd4bb46b8a
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.16.3.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.19.0.ebuild
index e4a362f0ca50..e4a362f0ca50 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.16.3.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.19.0.ebuild
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index f1b0045b7031..b58977299edd 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,3 +1,3 @@
-DIST skypeforlinux_8.33.0.41-1.x86_64.rpm 96280740 BLAKE2B db751b800116587ae97600947372eaa655d438dfd6e70ad8e47d57bc4398ac47d4a01f49be7c9a0c1fb0606df8b0bad287577ada6da2999b384a01b3188e26f0 SHA512 f8c201f4da0f838982d64f51c9428d27bb4dd01f9eb753303600096406a1dc6d28af897985efb3f46bea9f0ef79708998e3e9308f92e2f0f4f42b1dca42b938b
-EBUILD skypeforlinux-8.33.0.41.ebuild 3685 BLAKE2B 5f3aa791f48fe0056e38d189053572b0d57b19d1246ab63f7a75574435528dc7e40c12ed833084bf2e1c29d7e2f6e55de77b2e1a4a712ae9db4eb2bbfc830c66 SHA512 463c53ca2023bddd96e91d7a382fe544c4583936241e8cb96eab77f69c0845e5ca2cb10f5421f294ca5fdb2b96e041419a98c57de200aadb21e842baa77b9f7b
+DIST skypeforlinux_8.34.0.78-1.x86_64.rpm 96457671 BLAKE2B 260de8eabddbad74ea5b0bdf903eb6607eab320713e746da315b7de2a897c1e8df9fbe8e279666101fb1894c547c23dcff4e7259a35e4f61ae0a70174288d54f SHA512 b83bf553c92c21d2ee418409c7cc0b560f675f5d958c80d96b71e3be4ddefe2e75ea9b9f2b37f5e4d5f25c358e451940fb44182da173d039331f3a88083038e6
+EBUILD skypeforlinux-8.34.0.78.ebuild 3685 BLAKE2B 5f3aa791f48fe0056e38d189053572b0d57b19d1246ab63f7a75574435528dc7e40c12ed833084bf2e1c29d7e2f6e55de77b2e1a4a712ae9db4eb2bbfc830c66 SHA512 463c53ca2023bddd96e91d7a382fe544c4583936241e8cb96eab77f69c0845e5ca2cb10f5421f294ca5fdb2b96e041419a98c57de200aadb21e842baa77b9f7b
 MISC metadata.xml 678 BLAKE2B 08cae428a7267eb18dd5bbb460dcb617a8eaaf33ccce7229f90e3031f526125922b84d445577e91620e01ccaf789109c331bb11a03362cec9c15ad85162f4b43 SHA512 5372348bd01b1e828c29866180e85e9230ade0aa36f23bfcc89fb10dbf7f1b92530ac00c9dd0fe9977061a660abf9780ab2e59069db2115fb2dacbc5e3ffd26a
diff --git a/net-im/skypeforlinux/skypeforlinux-8.33.0.41.ebuild b/net-im/skypeforlinux/skypeforlinux-8.34.0.78.ebuild
index 63b1b43fe4a8..63b1b43fe4a8 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.33.0.41.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.34.0.78.ebuild
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
new file mode 100644
index 000000000000..c3c49e373f72
--- /dev/null
+++ b/net-im/spectrum2/Manifest
@@ -0,0 +1,8 @@
+AUX spectrum2-2.0.9-remove_debug_cflags.patch 376 BLAKE2B 21a4c230d57398d8ce5ff39cd1ad103fa1f7df332b88cf0024e2a505ecf9be7378da99eb83941122d5cf6a835bff9dfa7b9a10a2583299c91d8506dccc548c85 SHA512 3ec75a4ae915b7d2e2aa594fafcc559aa8b09b5cb8948931797088340d722bfb074ac8e0f77fea1258a7b2c3f0816d001aee63b4fd7cc334927a8431fb6a5611
+AUX spectrum2-2.0.9-use_qt5_libcommuni.patch 2428 BLAKE2B d6f377f9ac1d99d5af51a60d5b837bca6acd3d88c4b6cef9716f1f74198c3b5f2e3c4e153be9094c0af1b315f03b3e50c49fc9c93f262a76a0d137636e142b33 SHA512 fc08e37256782db97f7e067d6a3a51f1244c9f0610f69900711d706e6fa50591e200451432ee99691d899a2e6e95c987baa56d3708f2fd172524865dd07a51e5
+AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354b94749a577b9121352bd56e5d0adbae161da1afc7c451d18b36689844429b46fe39b2e364ffd8c363 SHA512 d780066a00144f3ec20311b462fd29986a486af7ce5ae88e788113397d6cb6ab0800119a5d71077216ee1637ff49cd2307e9265545357b4de50bf907c80feb9c
+AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
+AUX spectrum2.tmpfiles 44 BLAKE2B c0cef689f5b483d16461bf50edbe8a17c8269440a43a3ccf04c45e028704ad4861e7bd340b85b0daf11b5e41a51e19fd04f2dcd1f2446e00b9a6a3b1e08d2206 SHA512 b995bf8c97a98dc6c887d6d4bb4b53cfee85461cfe65770013d2a412729d164894201ad0e3b69868b94c159ecd524d7bd0eccfedbc27c81969c3ed640ae32785
+DIST spectrum2-2.0.9.tar.gz 842688 BLAKE2B 32cdb95c161aa97338895fb144200ac94d200aefb58300a8f55b03457b3aae1a0ef4a60311f0e2be8e3f3e331625d04ecd61a9583d07794c4398762e1348b939 SHA512 f111133d3d327619ebbeeaa8c329b09dbdbef9c66ec7bc06eb6eac8c54e144cbf2d81d2751699bf97ae1d1bf0a94581f3971394a7f06b9a4d69f6248f1497982
+EBUILD spectrum2-2.0.9.ebuild 2901 BLAKE2B c0dedfd2f7693469ce936daf90ce512546239343a387a453798e5c48e964b886df8355d0716c6e447a8bf378098994ca403f35b271a7e3a742b81ab15a44a844 SHA512 2f9c427748e3ccbeac88986e82b83ed785b6f950a04ba18fc6049309e494b9f4f9bd0d72df2eb7757eba80a07e6f3431479a3bce86bd00537f3ae734ef172f07
+MISC metadata.xml 1259 BLAKE2B e885a8348122a70994d3b04387d64fa88d2e02075554849d427f18b2b39b6ae1eeab543066cd587031f8eae9842f0d727f297d7b6cbe744c8d1424d9fb3640ce SHA512 be2129a4b76017ce3d84aa48589d54ac3863e1d9b7a1aa2a5d98341f962bda3f2e9507497056add0b4f280545ed0c511c8f50eff35d46cf9cadd2c6fba7b5ed6
diff --git a/net-im/spectrum2/files/spectrum2-2.0.9-remove_debug_cflags.patch b/net-im/spectrum2/files/spectrum2-2.0.9-remove_debug_cflags.patch
new file mode 100644
index 000000000000..19e3b83d2300
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.0.9-remove_debug_cflags.patch
@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt	2018-09-17 09:46:40.000000000 +0200
++++ b/CMakeLists.txt	2018-09-20 21:04:29.000000000 +0200
+@@ -384,10 +384,6 @@
+ endif()
+ 
+ if(CMAKE_BUILD_TYPE MATCHES Debug)
+-	if (CMAKE_COMPILER_IS_GNUCXX)
+-		ADD_DEFINITIONS(-O0)
+-		ADD_DEFINITIONS(-ggdb)
+-	endif()
+ 	ADD_DEFINITIONS(-DDEBUG)
+ 	message("Debug             : yes")
+ else(CMAKE_BUILD_TYPE MATCHES Debug)
diff --git a/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch b/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch
new file mode 100644
index 000000000000..27e23db44848
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch
@@ -0,0 +1,54 @@
+--- a/CMakeLists.txt	2018-09-17 09:46:40.000000000 +0200
++++ b/CMakeLists.txt	2018-09-20 20:57:35.000000000 +0200
+@@ -182,8 +182,7 @@
+ if(ENABLE_IRC)
+ 	find_package(Communi)
+ 
+-	INCLUDE(FindQt4)
+-	FIND_PACKAGE(Qt4 COMPONENTS QtCore QtNetwork)
++	FIND_PACKAGE(Qt5 COMPONENTS Core Network)
+ 	# ADD_DEFINITIONS(${SWIFTEN_CFLAGS})
+ 	ADD_DEFINITIONS(-DSUPPORT_LEGACY_CAPS)
+ 	# ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2)
+@@ -321,7 +320,6 @@
+ 		message("IRC plugin        : yes")
+ 		include_directories(${QT_QTNETWORK_INCLUDE_DIR})
+ 		include_directories(${IRC_INCLUDE_DIR})
+-		include(${QT_USE_FILE})
+ 	else()
+ 		if(ENABLE_IRC)
+ 			message("IRC plugin        : no (install libCommuni and libprotobuf-dev)")
+--- a/backends/libcommuni/CMakeLists.txt	2018-09-17 09:46:40.000000000 +0200
++++ b/backends/libcommuni/CMakeLists.txt	2018-09-20 20:59:31.000000000 +0200
+@@ -1,14 +1,14 @@
+ cmake_minimum_required(VERSION 2.6)
+ FILE(GLOB SRC *.cpp)
+ FILE(GLOB HEADERS *.h)
+-QT4_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
+-add_definitions(-DQT_NO_KEYWORDS)
++QT5_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
+ ADD_EXECUTABLE(spectrum2_libcommuni_backend ${SRC})
++include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS})
+ 
+ if (NOT WIN32)
+-	target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt4::QtNetwork Qt4::QtCore transport pthread)
++	target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt5::Network Qt5::Core transport pthread)
+ else ()
+-	target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt4::QtNetwork Qt4::QtCore transport)
++	target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt5::Network Qt5::Core transport)
+ endif()
+ INSTALL(TARGETS spectrum2_libcommuni_backend RUNTIME DESTINATION bin)
+ 
+--- a/cmake_modules/FindCommuni.cmake	2018-09-17 09:46:40.000000000 +0200
++++ b/cmake_modules/FindCommuni.cmake	2018-09-20 21:00:04.000000000 +0200
+@@ -1,8 +1,7 @@
+-find_package(Qt4)
+-include( ${QT_USE_FILE} )
++find_package(Qt5Network)
+ 
+ FIND_LIBRARY(IRC_LIBRARY NAMES IrcCore PATHS ${QT_LIBRARY_DIR})
+-FIND_PATH(IRC_INCLUDE_DIR NAMES "IrcCore/ircglobal.h" PATHS ${QT_INCLUDE_DIR} PATH_SUFFIXES Communi)
++FIND_PATH(IRC_INCLUDE_DIR NAMES "IrcCore/ircglobal.h" PATHS ${Qt5Core_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS}"/.." PATH_SUFFIXES Communi)
+ 
+ # message( STATUS ${IRC_LIBRARY})
+ if( IRC_LIBRARY AND IRC_INCLUDE_DIR )
diff --git a/net-im/spectrum2/files/spectrum2.initd b/net-im/spectrum2/files/spectrum2.initd
new file mode 100644
index 000000000000..8a35dbe75bc9
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2.initd
@@ -0,0 +1,47 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/spectrum2_manager"
+command_group="spectrum"
+command_user="spectrum"
+name="Spectrum2 Transport"
+shell="/bin/sh"
+su="/bin/su"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting ${name}"
+	"${su}" "${command_user}" -c "${command} start" -s "${shell}"
+	eend $?
+}
+
+start_pre() {
+	# Ensure /run/spectrum2 dir is owned by spectrum user.
+	# spectrum2_manager stores pidfiles of individual services here.
+	# See security related comment at the bottom.
+	checkpath -d -o "${command_user}:${command_group}" -q "/run/spectrum2"
+}
+
+status() {
+	ebegin "Status ${name}"
+	"${su}" "${command_user}" -c "${command} status" -s "${shell}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${name}"
+	"${su}" "${command_user}" -c "${command} stop" -s "${shell}"
+	eend $?
+}
+
+# Andrey Utkin <andrey_utkin@gentoo.org> (24 Nov 2018)
+# Conrad Kostecki <conrad@kostecki.com> (24 Nov 2018)
+# We are aware of many security issues caused by careless chowning, see
+# http://michael.orlitzky.com/articles/end_root_chowning_now_(make_etc-init.d_great_again).xhtml
+# We believe none of these issues apply.
+# These pidfiles are not read by any privileged process.
+# checkpath here chowns only the dir itself and doesn't act recursively.
diff --git a/net-im/spectrum2/files/spectrum2.service b/net-im/spectrum2/files/spectrum2.service
new file mode 100644
index 000000000000..9d5b72315ef5
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Spectrum2 Transport
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/spectrum2_manager start
+ExecStop=/usr/bin/spectrum2_manager stop
+User=spectrum
+Group=spectrum
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-im/spectrum2/files/spectrum2.tmpfiles b/net-im/spectrum2/files/spectrum2.tmpfiles
new file mode 100644
index 000000000000..4ce6f1c3ca75
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2.tmpfiles
@@ -0,0 +1 @@
+d /run/spectrum2 0700 specturm spectrum - -
diff --git a/net-im/spectrum2/metadata.xml b/net-im/spectrum2/metadata.xml
new file mode 100644
index 000000000000..d7eb552115dc
--- /dev/null
+++ b/net-im/spectrum2/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrey_utkin@gentoo.org</email>
+		<name>Andrey Utkin</name>
+	</maintainer>
+	<longdescription>
+		Spectrum is an open source instant messaging transport.
+		It allows users to chat together even when they are using
+		different IM networks. It acts as a transport layer between
+		the users as showed in the animation above.
+	</longdescription>
+	<use>
+		<flag name="frotz">Enables the Z-Engine backend.</flag>
+		<flag name="irc">Enables the IRC backend, based on <pkg>net-im/libcommuni</pkg>.</flag>
+		<flag name="purple">Enables the libpurple backend, based on <pkg>net-im/pidgin</pkg>.</flag>
+		<flag name="sms">Enables the SMS backend, based on <pkg>app-mobilephone/smstools</pkg>.</flag>
+		<flag name="whatsapp">Enables the WhatsApp backend, based on <pkg>net-im/transwhat</pkg>.</flag>
+		<flag name="twitter">Enables the Twitter backend.</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-im/spectrum2/spectrum2-2.0.9.ebuild b/net-im/spectrum2/spectrum2-2.0.9.ebuild
new file mode 100644
index 000000000000..5533572a03cf
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.0.9.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1 systemd user
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im"
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	dev-libs/libev:=
+	dev-libs/log4cxx
+	dev-libs/jsoncpp:=
+	dev-libs/openssl:0=
+	dev-libs/popt
+	dev-libs/protobuf:=
+	net-dns/libidn:0=
+	net-im/swift:=
+	net-misc/curl
+	sys-libs/zlib:=
+	frotz? ( !games-engines/frotz )
+	irc? ( net-im/libcommuni )
+	mysql? (
+		|| (
+			dev-db/mariadb-connector-c
+			dev-db/mysql-connector-c
+		)
+	)
+	postgres? ( dev-libs/libpqxx:= )
+	purple? (
+		dev-libs/glib
+		net-im/pidgin:=
+	)
+	sms? ( app-mobilephone/smstools )
+	sqlite? ( dev-db/sqlite:3 )
+	twitter? ( net-misc/curl )
+	whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+	${PYTHON_DEPS}
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-python/sleekxmpp[${PYTHON_USEDEP}]
+		dev-util/cppunit
+		net-irc/ngircd
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-remove_debug_cflags.patch"
+	"${FILESDIR}/${P}-use_qt5_libcommuni.patch"
+)
+
+# Tests are currently restricted, as they do completly fail
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup spectrum
+	enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum
+
+	use test && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Respect users LDFLAGS
+	sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
+
+	# Respect users CFLAGS, when compiling for debug mode
+	# Since Spectrum2 searches for a qt4 compiled libcommuni,
+	# it must be patched, to find the qt5 compiled libcommuni,
+	# See: https://github.com/SpectrumIM/spectrum2/pull/253
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	use debug && CMAKE_BUILD_TYPE="Debug"
+
+	local mycmakeargs=(
+		-DENABLE_DOCS="$(usex doc)"
+		-DENABLE_FROTZ="$(usex frotz)"
+		-DENABLE_IRC="$(usex irc)"
+		-DENABLE_MYSQL="$(usex mysql)"
+		-DENABLE_PQXX="$(usex postgres)"
+		-DENABLE_PURPLE="$(usex purple)"
+		-DENABLE_SMSTOOLS3="$(usex sms)"
+		-DENABLE_SQLITE3="$(usex sqlite)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_TWITTER="$(usex twitter)"
+		-DENABLE_XMPP="$(usex xmpp)"
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd tests/libtransport && "${EPYTHON}" ../start.py || die
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	diropts -o spectrum -g spectrum
+	keepdir /var/log/spectrum2 /var/lib/spectrum2
+	diropts
+
+	newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+	systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+	systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles spectrum2.conf
+
+	einstalldocs
+}
diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
new file mode 100644
index 000000000000..ac464da24f54
--- /dev/null
+++ b/net-im/swift/Manifest
@@ -0,0 +1,6 @@
+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 4328 BLAKE2B abe8a088feb575117ef747e8069ad87244438b24886134e02b12dce5a7d3e5e9d7cc0676422ce2778b59d2eee67f3ad7bcaaded2a9bf67ba6f93e48cb5652404 SHA512 00c5ef5b7941be9b5ba2090121fbed3355dbdc31e0476cde5f764b13a531d0a361c8ef1d15a8dd388fc639691005585f118d3a0ad1b4666c231a0e3e827dbf96
+EBUILD swift-4.0.2.ebuild 4329 BLAKE2B cac1a60927e5ee80d8827963253b5e1f3972ea795d0048ec7b59b876e701aa5925ddaf77d1b57f716e821e2234a1290a2fce3178085980529b3b437d7ea1d1fe SHA512 4e267eb44ac4d7a4c529c948cdfd6717ee7e5fa41000f1df30a842386e424cfd33621696a5dd471b12c853d26b6e52a4d7b42f1a3617f7d3a9248c0f415114f0
+MISC metadata.xml 970 BLAKE2B ff45a5b75d9ec07a6d6bd1e65acaac799f56ef2f01d689d3e5e887a9a135e7d446a789c4d0445a64f1d904386d7c9ff0d12a990d71df024ab2f647bb8bf19a27 SHA512 6e820b2770aa305bfc1a1c9605f62404ee35485759451ce7fb1155329f666182238a8075f1e2ebcc77b1e9e5896040bca8ecbd541a813be5b09bcd2aa6ae2584
diff --git a/net-im/swift/files/swift-4.0.2-make-generated-files-handle-unicode-characters.patch b/net-im/swift/files/swift-4.0.2-make-generated-files-handle-unicode-characters.patch
new file mode 100644
index 000000000000..7fd2e386d9d9
--- /dev/null
+++ b/net-im/swift/files/swift-4.0.2-make-generated-files-handle-unicode-characters.patch
@@ -0,0 +1,38 @@
+From 39ff091cddf8fd5e01047d80c7ed60c150537705 Mon Sep 17 00:00:00 2001
+From: Thanos Doukoudakis <thanos.doukoudakis@isode.com>
+Date: Fri, 11 May 2018 11:26:39 +0100
+Subject: Make generated files handle Unicode characters
+
+This patch handles a case where some of the files used to generate COPYING,
+were containing unicode strings, which could lead to a failure when building
+sid package. The code now will check the type of the string before writing to
+the file, and if needed it will transform it to the appropriate format.
+
+Test-Information:
+Generated the sid package with package_all_platforms script with no problems.
+Created a debian sid box and tested the installation of the generated
+packages. Validated the output generated in Windows 10 and Ubuntu 16.04 builds
+through the "About" dialog in Swift.
+
+Change-Id: I05e518b758f316d9fbf23c1079be5a462e75106c
+
+diff --git a/BuildTools/SCons/Tools/textfile.py b/BuildTools/SCons/Tools/textfile.py
+index 89f8963..9b424f2 100644
+--- a/BuildTools/SCons/Tools/textfile.py
++++ b/BuildTools/SCons/Tools/textfile.py
+@@ -113,7 +113,11 @@ def _action(target, source, env):
+     lsep = None
+     for s in source:
+         if lsep: fd.write(lsep)
+-        fd.write(_do_subst(s, subs))
++        stringtowrite = _do_subst(s, subs)
++        if isinstance(stringtowrite, str):
++          fd.write(stringtowrite)
++        elif isinstance(stringtowrite, unicode):
++          fd.write(stringtowrite.encode('utf-8'))
+         lsep = linesep
+     fd.close()
+ 
+-- 
+cgit v0.10.2-6-g49f6
+
diff --git a/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch b/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch
new file mode 100644
index 000000000000..db633945b49d
--- /dev/null
+++ b/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch
@@ -0,0 +1,35 @@
+From 1d18148c86377787a8c77042b12ea66f20cb2ca9 Mon Sep 17 00:00:00 2001
+From: Tobias Markmann <tm@ayena.de>
+Date: Thu, 21 Jun 2018 13:04:56 +0200
+Subject: Add missing include for QAbstractItemModel
+
+This fixes building Swift with Qt 5.11.
+
+Test-Information:
+
+Builds and tests pass on macOS 10.13.5 with Qt 5.11.0.
+
+Change-Id: I1be2cd081d8a520ec38ab7cca5ada0d7fc39b777
+
+diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+index 0714ac1..fe536ab 100644
+--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h
++++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2010-2016 Isode Limited.
++ * Copyright (c) 2010-2018 Isode Limited.
+  * All rights reserved.
+  * See the COPYING file for more information.
+  */
+@@ -8,6 +8,7 @@
+ 
+ #include <set>
+ 
++#include <QAbstractItemModel>
+ #include <QWizard>
+ 
+ #include <Swiften/Base/Override.h>
+-- 
+cgit v0.10.2-6-g49f6
+
diff --git a/net-im/swift/metadata.xml b/net-im/swift/metadata.xml
new file mode 100644
index 000000000000..c7c45c7e8bd1
--- /dev/null
+++ b/net-im/swift/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrey_utkin@gentoo.org</email>
+		<name>Andrey Utkin</name>
+	</maintainer>
+	<longdescription>
+		Swift is an elegant, secure, adaptable and intuitive XMPP client,
+		with features that make it suitable for a wide range of use scenarios.
+		Swiften is a robust, high-quality, standards-compliant,
+		cross-platform, and performant C++ library for
+		implementing XMPP applications.
+	</longdescription>
+	<use>
+		<flag name="client">Build the full graphical XMPP client.</flag>
+		<flag name="gconf">Enable configuration through <pkg>gnome-base/gconf</pkg>.</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-im/swift/swift-4.0.2-r1.ebuild b/net-im/swift/swift-4.0.2-r1.ebuild
new file mode 100644
index 000000000000..1fdb1c0dd085
--- /dev/null
+++ b/net-im/swift/swift-4.0.2-r1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils scons-utils toolchain-funcs
+
+DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client"
+HOMEPAGE="https://www.swift.im/"
+SRC_URI="https://swift.im/downloads/releases/${P}/${P}.tar.gz"
+
+LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
+SLOT="4/0"
+KEYWORDS="~amd64"
+IUSE="client expat gconf +icu +idn lua spell test zeroconf"
+REQUIRED_USE="
+	|| ( icu idn )
+	gconf? ( client )
+	spell? ( client )
+"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/boost:=
+	dev-libs/openssl:0=
+	net-libs/libnatpmp
+	net-libs/miniupnpc:=
+	sys-libs/zlib:=
+	client? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtx11extras:5
+		net-dns/avahi
+	)
+	expat? ( dev-libs/expat )
+	!expat? ( dev-libs/libxml2:2 )
+	gconf? ( gnome-base/gconf:2 )
+	icu? ( dev-libs/icu:= )
+	idn? ( net-dns/libidn:= )
+	lua? ( dev-lang/lua:= )
+	spell? ( app-text/hunspell:= )
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/scons-3.0.1-r3
+	client? ( dev-qt/linguist-tools:5 )
+	test? ( net-dns/avahi )
+"
+
+# Tests don't run, as they fail with "[QA/UnitTest/**dummy**] Error -6".
+RESTRICT="test"
+
+DOCS=(
+	"DEVELOPMENT.md"
+	"README.md"
+	"Swiften/ChangeLog.md"
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-make-generated-files-handle-unicode-characters.patch
+	"${FILESDIR}"/${P}-qt-5.11-compatibility.patch
+)
+
+src_prepare() {
+	default
+
+	# 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
+
+	# Remove parts of Swift, which a user don't want to compile
+	if ! use client; then rm -fr Swift Slimber || die; fi
+	if ! use lua; then rm -fr Sluift || die; fi
+	if ! use zeroconf; then
+		rm -fr Limber || die
+		if use client; then rm -fr Slimber || die; fi
+	fi
+
+	# Remove '3rdParty', as the system libs should be used
+	# `CppUnit`, `GoogleTest` and `HippoMocks` are needed for tests
+	local my3rdparty=(
+		Boost
+		Breakpad
+		DocBook
+		Expat
+		LCov
+		Ldns
+		LibIDN
+		LibMiniUPnPc
+		LibNATPMP
+		Lua
+		OpenSSL
+		SCons
+		SQLite
+		Unbound
+		ZLib
+	)
+
+	if use test; then
+		cd 3rdParty && rm -fr "${my3rdparty[@]}" || die
+	else
+		rm -fr 3rdParty || die
+	fi
+}
+
+src_configure() {
+	MYSCONS=(
+		ar="$(tc-getAR)"
+		allow_warnings="yes"
+		assertions="no"
+		build_examples="yes"
+		boost_bundled_enable="false"
+		boost_force_bundled="false"
+		cc="$(tc-getCC)"
+		ccache="no"
+		ccflags="${CFLAGS}"
+		coverage="no"
+		cxx="$(tc-getCXX)"
+		cxxflags="${CXXFLAGS}"
+		debug="no"
+		distcc="no"
+		experimental="no"
+		experimental_ft="yes"
+		hunspell_enable="$(usex spell)"
+		icu="$(usex icu)"
+		install_git_hooks="no"
+		libidn_bundled_enable="false"
+		libminiupnpc_force_bundled="false"
+		libnatpmp_force_bundled="false"
+		link="$(tc-getCXX)"
+		linkflags="${LDFLAGS}"
+		max_jobs="no"
+		optimize="no"
+		qt="${T}/qt"
+		qt5="$(usex client)"
+		swiften_dll="true"
+		swift_mobile="no"
+		target="native"
+		test="none"
+		try_avahi="$(usex client)"
+		try_expat="$(usex expat)"
+		try_gconf="$(usex gconf)"
+		try_libidn="$(usex idn)"
+		try_libxml="$(usex !expat)"
+		tls_backend="openssl"
+		unbound="no"
+		V="1"
+		valgrind="no"
+		zlib_bundled_enable="false"
+	)
+}
+
+src_compile() {
+	local myesconsinstall=(
+		Swiften
+		$(usex client Swift '')
+		$(usex lua Sluift '')
+		$(usex zeroconf Limber '')
+		$(usex zeroconf "$(usex client Slimber '')" '')
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+}
+
+src_test() {
+	MYSCONS=(
+		V="1"
+	)
+
+	escons "${MYSCONS[@]}" test=unit QA
+}
+
+src_install() {
+	local myesconsinstall=(
+		SWIFTEN_INSTALLDIR="${ED%/}/usr"
+		SWIFTEN_LIBDIR="${ED%/}/usr/$(get_libdir)"
+		$(usex client "SWIFT_INSTALLDIR=${ED%/}/usr" '')
+		$(usex lua "SLUIFT_DIR=${ED%/}/usr" '')
+		$(usex lua "SLUIFT_INSTALLDIR=${ED%/}/usr" '')
+		"${ED}"
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+
+	use zeroconf && dobin Limber/limber
+	use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli
+	use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use client && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use client && gnome2_icon_cache_update
+}
diff --git a/net-im/swift/swift-4.0.2.ebuild b/net-im/swift/swift-4.0.2.ebuild
new file mode 100644
index 000000000000..c67278ade281
--- /dev/null
+++ b/net-im/swift/swift-4.0.2.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils scons-utils toolchain-funcs
+
+DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client"
+HOMEPAGE="https://www.swift.im/"
+SRC_URI="https://swift.im/downloads/releases/${P}/${P}.tar.gz"
+
+LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
+SLOT="4/0"
+KEYWORDS="~amd64"
+IUSE="client expat gconf +icu +idn lua spell test zeroconf"
+REQUIRED_USE="
+	|| ( icu idn )
+	gconf? ( client )
+	spell? ( client )
+"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/boost:=
+	dev-libs/openssl:0=
+	net-libs/libnatpmp
+	net-libs/miniupnpc:=
+	sys-libs/zlib:=
+	client? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtx11extras:5
+		net-dns/avahi
+	)
+	expat? ( dev-libs/expat )
+	!expat? ( dev-libs/libxml2:2 )
+	gconf? ( gnome-base/gconf:2 )
+	icu? ( dev-libs/icu:= )
+	idn? ( net-dns/libidn:= )
+	lua? ( dev-lang/lua:= )
+	spell? ( app-text/hunspell:= )
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/scons-3.0.1-r3
+	client? ( dev-qt/linguist-tools:5 )
+	test? ( net-dns/avahi )
+"
+
+# Tests don't run, as they fail with "[QA/UnitTest/**dummy**] Error -6".
+RESTRICT="test"
+
+DOCS=(
+	"DEVELOPMENT.md"
+	"README.md"
+	"Swiften/ChangeLog.md"
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-make-generated-files-handle-unicode-characters.patch
+	"${FILESDIR}"/${P}-qt-5.11-compatibility.patch
+)
+
+src_prepare() {
+	default
+
+	# 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
+
+	# Remove parts of Swift, which a user don't want to compile
+	if ! use client; then rm -fr Swift Slimber || die; fi
+	if ! use lua; then rm -fr Sluift || die; fi
+	if ! use zeroconf; then
+		rm -fr Limber || die
+		if use client; then rm -fr Slimber || die; fi
+	fi
+
+	# Remove '3rdParty', as the system libs should be used
+	# `CppUnit`, `GoogleTest` and `HippoMocks` are needed for tests
+	local my3rdparty=(
+		Boost
+		Breakpad
+		DocBook
+		Expat
+		LCov
+		Ldns
+		LibIDN
+		LibMiniUPnPc
+		LibNATPMP
+		Lua
+		OpenSSL
+		SCons
+		SQLite
+		Unbound
+		ZLib
+	)
+
+	if use test; then
+		cd 3rdParty && rm -fr "${my3rdparty[@]}" || die
+	else
+		rm -fr 3rdParty || die
+	fi
+}
+
+src_configure() {
+	MYSCONS=(
+		ar="$(tc-getAR)"
+		allow_warnings="yes"
+		assertions="no"
+		build_examples="yes"
+		boost_bundled_enable="false"
+		boost_force_bundled="false"
+		cc="$(tc-getCC)"
+		ccache="no"
+		ccflags="${CFLAGS}"
+		coverage="no"
+		cxx="$(tc-getCXX)"
+		cxxflags="${CXXFLAGS}"
+		debug="no"
+		distcc="no"
+		experimental="yes"
+		experimental_ft="yes"
+		hunspell_enable="$(usex spell)"
+		icu="$(usex icu)"
+		install_git_hooks="no"
+		libidn_bundled_enable="false"
+		libminiupnpc_force_bundled="false"
+		libnatpmp_force_bundled="false"
+		link="$(tc-getCXX)"
+		linkflags="${LDFLAGS}"
+		max_jobs="no"
+		optimize="no"
+		qt="${T}/qt"
+		qt5="$(usex client)"
+		swiften_dll="true"
+		swift_mobile="no"
+		target="native"
+		test="none"
+		try_avahi="$(usex client)"
+		try_expat="$(usex expat)"
+		try_gconf="$(usex gconf)"
+		try_libidn="$(usex idn)"
+		try_libxml="$(usex !expat)"
+		tls_backend="openssl"
+		unbound="no"
+		V="1"
+		valgrind="no"
+		zlib_bundled_enable="false"
+	)
+}
+
+src_compile() {
+	local myesconsinstall=(
+		Swiften
+		$(usex client Swift '')
+		$(usex lua Sluift '')
+		$(usex zeroconf Limber '')
+		$(usex zeroconf "$(usex client Slimber '')" '')
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+}
+
+src_test() {
+	MYSCONS=(
+		V="1"
+	)
+
+	escons "${MYSCONS[@]}" test=unit QA
+}
+
+src_install() {
+	local myesconsinstall=(
+		SWIFTEN_INSTALLDIR="${ED%/}/usr"
+		SWIFTEN_LIBDIR="${ED%/}/usr/$(get_libdir)"
+		$(usex client "SWIFT_INSTALLDIR=${ED%/}/usr" '')
+		$(usex lua "SLUIFT_DIR=${ED%/}/usr" '')
+		$(usex lua "SLUIFT_INSTALLDIR=${ED%/}/usr" '')
+		"${ED}"
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+
+	use zeroconf && dobin Limber/limber
+	use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli
+	use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use client && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use client && gnome2_icon_cache_update
+}
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index ae0300c19501..b2793cab73b2 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,7 +1,16 @@
 AUX fonts.conf 1656 BLAKE2B 551a0651aeeaf43ac955731c492232014d10cdbac7e04a0be7bb915218e1f70c4082491d5e081b3cdc4c713398119a7ce9d25c787647f521b37f00a5b16caa15 SHA512 662ad4f6b91ae4d8479ee79f298d94f7862eb71031b5aa726b89e1d1e1bc71050437af73137a3aad71236fd3535527cbc37d394300a2191bcc51ea8d075ec513
+AUX telegram-desktop-bin 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
 AUX telegram-desktop-bin-r2 646 BLAKE2B 4a99820a48dee103680bd81ba738c3a56538864b44f39a950e41232a7f39d85aee69542abb2de3bdc09ce9bc00de20aa17983626ffe25ba71e53a7d25a2573c6 SHA512 56be7103c3d9aa120aa16f67e11c1600d52b69c9424f9cb88754bf2dd8b559abfa254ca60fba07d07de35c2d9375fce90fb37bb008e5cc806386df043dfab6ff
-DIST tdesktop-1.4.3.tar.gz 17341652 BLAKE2B 26bacb695bb6e5adfd9fcdb394652695b6d8300fb856caf12cb7e22dd571b370cf74d38363c7eecdd8d7bde9fc3d43a91fd08ab175c2d3406db4f8cfed8619aa SHA512 c72deb10be79221c86b84cb36cf647e69bd51f57c05ae0ab0a43a23b04829aed068536124acfafd308e2b850de64bf448eec770e1d6a5423bb4a6b4c445edb6f
-DIST tsetup.1.4.3.tar.xz 34895128 BLAKE2B efea0915fee03ff7eecd4739b4c656b7282858611c96d7a59faf8e59f94a6a6bb5e29060f280af2dee5e7f6516564268e977f1e801cce0f1bd7c6bbdf491128d SHA512 fb344584fa2ce2adb53c6377cee34d917464495aaa0aa20d80ef80071f480ea2477f5fed4d5af336e95c9999dc2f2c73d30ff72146662d076d254b23bfc57969
-DIST tsetup32.1.4.3.tar.xz 37493196 BLAKE2B 1643016dd13e4f214fbac9892c7784f6998ce5fefd50d001d38db1fbd92c2f102eadf4b7d15a46e2151eeff971b5ed70f5ac8b9476ff4d7d489ad8c0ebf95f17 SHA512 e5b321da75b15c97438d30d480ce73305d97fe3373146650f132931f0620ea75aeac369a031ed070e0695af0b85335bb605d9b8b3a8047de3d739ab08bfa8578
-EBUILD telegram-desktop-bin-1.4.3-r1.ebuild 1972 BLAKE2B e9b51c687cc314bc6fbfa35ddec86d7f98893dc1552bf4dbb72cfe05514ee9611ae45e17f859cfbe27285bb74077b665dc97e4ed970133af8d3e110fa8bf398b SHA512 f7c6701e03baa23402ead8c1ec813065f8d1ef220030580595a0254606257feaab6d726e540fafb3d3954332e30b6b47a492bf5ab294c4d385ae83ee3c502b1f
+DIST tdesktop-1.5.1.tar.gz 14105322 BLAKE2B d78859771f891eb04223cc8a6992daf4d6e9f33f4fdf810629fd640bc3a504911994fb6f2c67c7ca9163dd3be9cfa7eb9f21e7f3a9ac244a78e7d21dc3b7ae70 SHA512 9e9f24d925c4aa36961abeec9b4ca1a08238ba716ed5e472ae7d9660af7d2660de4a7fa92eb34fb27b5a5a17bbe78a803cf2953c159c3ee84996d2fc7ff389d3
+DIST tdesktop-1.5.2.tar.gz 14107995 BLAKE2B b366e3891cecb0b35348c9a94281db6c1a59038dc5f10c15267f8109ee1ee0e88a4dfbc3494876cc835f29ab32c4303d6bd462985c731dbfc2c7736ad6e55273 SHA512 a81660b3b6ef58017e3ec3d4584bc7aa3db138450e4a30e6d7276b0bcffb5683866c8eb44d54554287ac1f3c6d149e1db63a4c68d5e3e90bb2d59c7ba3a9022d
+DIST tdesktop-1.5.3.tar.gz 14128888 BLAKE2B 88cf2fc4a8645ba13ad27451e0404d7e558feeefc547bb0e44036538c81f6de049d6c672d4323e3f969e37104e64cf4f032465d649e5f05608fefca07d37b463 SHA512 f41cea42faa59d76d4b7bfb7a72dde58c6bcb3189a85655274b5db12e2fa7c78564b7eaebbefc92173e0b47ea8183fe129a73c26cd2d85210353906fb0ff935f
+DIST tsetup.1.5.1.tar.xz 32080940 BLAKE2B 3ecf42f88904d343d25f927b6f043a916b6ea90e1b1fbb60f34572cf71858d31fa68c240d82daef3c3343295b6defb5be019379d3b018ce7fcf961387290797b SHA512 70a35d5af9a8d4a212f5c7b63989d02392e3d0da30e7baf0644a609899547393a019061e71905a708c14c12e09cf32ced6b42f5889c287b32f4395b3236686c5
+DIST tsetup.1.5.2.tar.xz 32020040 BLAKE2B d0ef2a568978fe3f9bc458648d0a6d084cefc4a8cc9c31955f96ce16a825847aa158b9e84a9f3388b6e9defb6205f8669f44a7c0d32c793479d7da209f09c45f SHA512 2db0b8f6afa49870e4b2e6bbe9250f0312528c20f9b3d35254865019c61a01adc3a185d010b79a8af52b4fe9fb087c08b32d438c18065fb57656b48e40baed11
+DIST tsetup.1.5.3.tar.xz 32139064 BLAKE2B 2fed73bcbc991c4cd531b0f04d0cf493df10d287c66820f2aa15c93b81077405506092b27013540b56d93ddb6e11172e78dfef91ed7b3bd1bd87d42d374aa38a SHA512 12c6d148f27e9d98ecc56131a118010ba20cde5eed77d9438181ca13c26b9ac402edd351a05b251431f920405ae7df243c3b9d9a6e28359c4ec0a5045980ef37
+DIST tsetup32.1.5.1.tar.xz 34530452 BLAKE2B 2c074baf733780afc35b64e70f6d4bf8dcd49c44d60e1020f5061bc48e6a71283c8a32f2f848a0fa235b822c4a47e3e771e10306cfa751b9a22d835f18842306 SHA512 f2767b5b0ac027ce341dac2616a18cc865e8e41524a24b17e91b7ad7b14d921fde837e4721da161685a1e7572c3dc3649e3c57f818848979232e23e9ee91d0b0
+DIST tsetup32.1.5.2.tar.xz 33702468 BLAKE2B 259f24c53e4687828ad3313485f4cbdf2113d74f1b36a982c6f495f1e7c3cf03344754a49f115994894f4aee669170963ab494a7fd5adb588729596142335792 SHA512 d1f36dfd1f723237c0e0f0d65f66006d9958f61c01a6a6c80265c47f1d10f940811b3b2db7d786e098fefaf949c04f371cc324db9fb35ffba80ebb4188be4ce9
+DIST tsetup32.1.5.3.tar.xz 34630040 BLAKE2B 76f1d46d06d06440a4b586a6338b2870f46a4be16e7906d795391784b11c15d8434c524f2adcb5be42d67bc8af82257011eeb621b3cda159c0bf0e4071002358 SHA512 09c0a6ac58d8fb57aa50092788731168bc4364b665edc2bef595b84214e1723f0a36439f46aff5e337296607fc74b7cc039a1d7a42a357629132750109bfea35
+EBUILD telegram-desktop-bin-1.5.1.ebuild 1632 BLAKE2B 5a5c570a88f0ea40bb97230d0ede96932ea5cce3b045e5fd51a29ae6a95249d6e96b99e9e2653805fa36d7609ea25c97087e9cdbb218a8f2b7cae792089fc042 SHA512 ced48bb10c17618b12298568b1e236c66af967fd32d84ed41257a4e4aff97004cc9278981b7ec2ce865833410e4134816b552fca9f135d261d87cfeae34c891a
+EBUILD telegram-desktop-bin-1.5.2.ebuild 1632 BLAKE2B 5a5c570a88f0ea40bb97230d0ede96932ea5cce3b045e5fd51a29ae6a95249d6e96b99e9e2653805fa36d7609ea25c97087e9cdbb218a8f2b7cae792089fc042 SHA512 ced48bb10c17618b12298568b1e236c66af967fd32d84ed41257a4e4aff97004cc9278981b7ec2ce865833410e4134816b552fca9f135d261d87cfeae34c891a
+EBUILD telegram-desktop-bin-1.5.3.ebuild 1632 BLAKE2B 5a5c570a88f0ea40bb97230d0ede96932ea5cce3b045e5fd51a29ae6a95249d6e96b99e9e2653805fa36d7609ea25c97087e9cdbb218a8f2b7cae792089fc042 SHA512 ced48bb10c17618b12298568b1e236c66af967fd32d84ed41257a4e4aff97004cc9278981b7ec2ce865833410e4134816b552fca9f135d261d87cfeae34c891a
 MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
diff --git a/net-im/telegram-desktop-bin/files/telegram-desktop-bin b/net-im/telegram-desktop-bin/files/telegram-desktop-bin
new file mode 100644
index 000000000000..954b3bdeaea5
--- /dev/null
+++ b/net-im/telegram-desktop-bin/files/telegram-desktop-bin
@@ -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.4.3-r1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.1.ebuild
index 9621c1b3d009..d24c8adae29f 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.3-r1.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.1.ebuild
@@ -9,8 +9,8 @@ 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 )
+	amd64? ( https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/tsetup.${PV}.tar.xz )
+	x86? ( https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/tsetup32.${PV}.tar.xz )
 "
 
 LICENSE="telegram"
@@ -33,7 +33,7 @@ S="${WORKDIR}/Telegram"
 src_install() {
 	exeinto /usr/lib/${PN}
 	doexe "Telegram"
-	newbin "${FILESDIR}"/${PN}-r2 "telegram-desktop"
+	newbin "${FILESDIR}"/${PN} "telegram-desktop"
 
 	local icon_size
 	for icon_size in 16 32 48 64 128 256 512; do
@@ -42,10 +42,6 @@ src_install() {
 			telegram.png
 	done
 
-	dodir /etc/${PN}
-	insinto /etc/${PN}/
-	doins "${FILESDIR}"/fonts.conf
-
 	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
 }
 
@@ -61,12 +57,6 @@ pkg_postinst() {
 	einfo "\"~/.local/share/applications/telegram.desktop\". These files"
 	einfo "conflict with the one shipped by portage and should be removed"
 	einfo "from all homedirs. (https://bugs.gentoo.org/618662)"
-	einfo
-	einfo "This versions fixes fontconfig issues that have been reported"
-	einfo "by several users. However, the fix might have side-effects on"
-	einfo "non-latin fonts. If you have font issues with this version just"
-	einfo "delete \"/etc/${PN}/fonts.conf\" and leave a comment here"
-	einfo "https://bugs.gentoo.org/664872"
 }
 
 pkg_postrm() {
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.2.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.2.ebuild
new file mode 100644
index 000000000000..d24c8adae29f
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/tsetup.${PV}.tar.xz )
+	x86? ( https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/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]
+	>=media-libs/fontconfig-2.13
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	exeinto /usr/lib/${PN}
+	doexe "Telegram"
+	newbin "${FILESDIR}"/${PN} "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.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	einfo
+	einfo "Previous versions of ${PN} have created "
+	einfo "\"~/.local/share/applications/telegram.desktop\". These files"
+	einfo "conflict with the one shipped by portage and should be removed"
+	einfo "from all homedirs. (https://bugs.gentoo.org/618662)"
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.3.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.3.ebuild
new file mode 100644
index 000000000000..d24c8adae29f
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/tsetup.${PV}.tar.xz )
+	x86? ( https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/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]
+	>=media-libs/fontconfig-2.13
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	exeinto /usr/lib/${PN}
+	doexe "Telegram"
+	newbin "${FILESDIR}"/${PN} "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.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	einfo
+	einfo "Previous versions of ${PN} have created "
+	einfo "\"~/.local/share/applications/telegram.desktop\". These files"
+	einfo "conflict with the one shipped by portage and should be removed"
+	einfo "from all homedirs. (https://bugs.gentoo.org/618662)"
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index 3bcf6db1feab..31418ca6993e 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,9 +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-0.8.3.tar.gz 1147100 BLAKE2B d73a861112aca65e54773c98473c2858bb81e63fef11212633e34dac9e87101956e3ab0d9d56757767bc5d48d1d5a406e550f8fc55ae34860dbc4977c94ee347 SHA512 c8d746efcc055592dd990dfa57415cc1eacaaa3b66303d7583d9f9e7e98b8829c8f1ae849f36a243c8896e99787dd2e493c92367de719b20a4a160bc7daea76e
 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
 EBUILD toxic-0.8.2.ebuild 2259 BLAKE2B e71336c2ba6967780dbfcb4ec865429955d513679197f3e59ca4ba7277010a9b41cdcccb45c7d5771c3b379170f86d6d611cc3d80e3aafebd5ba7dcf3e86d069 SHA512 3864d5b5de55b14e0a1786229fc6a61611d137c8f9b9c832898dc6865de683d77f34866141ae8111118e5af4e23ab96bbeaaaf071a268d0c2c8e7c5f8c3740ba
 EBUILD toxic-0.8.3.ebuild 1846 BLAKE2B 4fb525bc9a87bb179a896870ce045adfd3fc4b1cf8c668e70881f872f10e700533b4e32d42eb8c682cc0e6ff0ae49438ec37dfbafe567044512fb2048a05ae18 SHA512 37d3d2d0fac7391a3fbb7022bb380439148ea02d329e4d1679e753855e6dbd263efa4c6e446ceb770a584a5b0ef784546870b8a457a243ef572deda35986835c
-MISC metadata.xml 1136 BLAKE2B bf8ee37048be3570aa5b0c8c8503be1aa60f15def81e52aaa80718d086c9e12c63cd1b938ff4de1d4720a27322b77f54dcfcf76777bd58bc760252f276832abf SHA512 33c321202660079cfc0c7313276b775104e617618400932d66a8cc24697fd62d6b789c95f83cd00591bea7d47b5d5f0d5bae1122f4b9d54ce23bbdf660b9e3fa
+MISC metadata.xml 984 BLAKE2B e990138cd52d9a9933635ac1a093a22305dd02896082e38b5fbbe7044fc77a1cf134db1a5923985566e89b360f2e98b7cb948e273580857a10ef5856f33c48e0 SHA512 3211f2bb29f8755718fb0cd45e37c3331271500a6d6dd0c47acee7b8e6f0d550fb9e8910d5d0769cd7ea217e7abeb1998886246c4ede1fe24b23d722a0341865
diff --git a/net-im/toxic/metadata.xml b/net-im/toxic/metadata.xml
index 0ba52a98e62a..02e709980dad 100644
--- a/net-im/toxic/metadata.xml
+++ b/net-im/toxic/metadata.xml
@@ -20,9 +20,7 @@
 		An ncurses-based Tox client written in C. Supports audio and video calling, file sharing, and desktop notifications.
 	</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>
diff --git a/net-im/toxic/toxic-0.8.0-r1.ebuild b/net-im/toxic/toxic-0.8.0-r1.ebuild
deleted file mode 100644
index e9a1018aa90b..000000000000
--- a/net-im/toxic/toxic-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+X +audio notifications +python +qrcode +video"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Not a typo; net-libs/tox only has a 'both or neither' option
-RDEPEND="
-	|| (
-	audio? ( net-libs/tox:0/0.1[av] )
-	video? ( net-libs/tox:0/0.1[av] )
-	net-libs/tox:0/0.1
-	)
-	dev-libs/libconfig
-	net-misc/curl:0=
-	sys-libs/ncurses:0=
-	audio? ( media-libs/openal media-libs/freealut )
-	video? ( media-libs/libvpx:= x11-libs/libX11 )
-	notifications? ( x11-libs/libnotify )
-	python? ( ${PYTHON_DEPS} )
-	qrcode? ( media-gfx/qrencode )
-"
-DEPEND="
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-verbose-build-log.patch"
-	)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# bug 630370: version string correction 0.7.2 -> 0.8.0
-	# REMOVE THIS FOR toxic != 0.8.0
-	sed -i \
-		-e 's/^\(TOXIC_VERSION =\).*$/\1 0.8.0/' \
-		cfg/global_vars.mk || die "Version string correction failed."
-}
-
-src_configure() {
-	export USER_CFLAGS="${CFLAGS}"
-	export USER_LDFLAGS="${LDFLAGS}"
-	if ! use video && ! use audio; then
-		export DISABLE_AV=1
-	fi
-	if ! use audio; then
-		export DISABLE_SOUND_NOTIFY=1
-	fi
-	if ! use X; then
-		export DISABLE_X11=1
-	fi
-	if ! use notifications; then
-		export DISABLE_DESKTOP_NOTIFY=1
-	fi
-	if ! use qrcode; then
-		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_compile() {
-	emake V=1 || die "emake failed"
-}
-
-src_install() {
-	default
-	if ! use audio; then
-		rm -r "${ED%/}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
-	fi
-}
diff --git a/net-im/transwhat/Manifest b/net-im/transwhat/Manifest
index 22c5f3af5793..e89a68bf9851 100644
--- a/net-im/transwhat/Manifest
+++ b/net-im/transwhat/Manifest
@@ -1,3 +1,3 @@
 DIST transwhat-0.2.2.tar.gz 49494 BLAKE2B 2d34a697df74d010aa030cd0162d6b1523d3e6eb1935251efb3c76a6259c8111f8644f244141c9724018f6617fef67bbd503be22d29a42bee3ffd619932cc3fb SHA512 4a292ba7dd064214e1f7e90f3a0da4f9fbd42e1227fe648ab2269b35c345eb7feda4d47d90b3ab95a31c356e6c0ad19aa6ffbea6641947810835ab06fbda4b75
-EBUILD transwhat-0.2.2.ebuild 875 BLAKE2B 1430bed676d19e1c2ccd9ff0a5b5bb5184c17808e6fc6aeb3756a9951a7c5a4d528cf9276f36f1aea18f94aacde177531e98311bd206e6530bedf09fa77e76cc SHA512 3c3a0862fe22575f8ca53452e7b8c6403ef31cdb2bdb400f8bbfaffe22ffe689741b5d6ba0ba39dfd13b31dfd3f2746bff4a6e79ac40953f6d1743595172fe67
-MISC metadata.xml 481 BLAKE2B ac11f22fdd6b29218a3f4f1d509a4595b2a5809f6bf762a7472ced7b3e16bdb5e23b57cbcdcaa2eb8c5c32b024c54b780d2ecfe1f20c02a49eaec9edea276f8b SHA512 ae9ba799931d5f4c0cf8774254f4072de619412896eb6d1fa8fdafa243368f78d17128eee88d49e5a8b9231613d52af6a475844e92c797e1e3e88baca3794d59
+EBUILD transwhat-0.2.2-r1.ebuild 893 BLAKE2B 4ab602fd9f71f692ae78e85dd9e09ce97fa6ae248db7b7b2e17959eb59966e8a23a1760deafc79dabc378dcdf6a368c899b7e5b6b32da39eb6b654f9efbb157e SHA512 0a8c16b53af152e7c02f1c7bd9da23151058202f8a96b3305f76ce2b9bda72bf6230674fb8a55014d19f501a85180947f8b651eec8f91b2bba178373b000e0b7
+MISC metadata.xml 624 BLAKE2B 72aa27524d91dcbf2f617d9a155c5598a42bca8872783ce03e2b5c67f3b100892bad7b4236fe1f290fe875fa6cb1f4cefbc6a3668a2d9a509a574c01a2e76ac5 SHA512 50485aa79a7020e230d4c13c335fee5ce531252a7a27475bff8488aad4b94189d8895606dc2868a718ffa71a3f6432aeec8159e41d3a8e18e780ca540dd968a7
diff --git a/net-im/transwhat/metadata.xml b/net-im/transwhat/metadata.xml
index 91277090fe3b..3be736289c91 100644
--- a/net-im/transwhat/metadata.xml
+++ b/net-im/transwhat/metadata.xml
@@ -12,4 +12,8 @@
 	<longdescription>
 		transWhat is a WhatsApp XMPP Gateway based on Spectrum 2 and Yowsup 2.
 	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/stv0g/transwhat/issues</bugs-to>
+		<remote-id type="github">stv0g/transwhat</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-im/transwhat/transwhat-0.2.2.ebuild b/net-im/transwhat/transwhat-0.2.2-r1.ebuild
index 6b03897d8fc8..3023b97715b4 100644
--- a/net-im/transwhat/transwhat-0.2.2.ebuild
+++ b/net-im/transwhat/transwhat-0.2.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -11,24 +11,27 @@ DESCRIPTION="A WhatsApp XMPP Gateway based on Spectrum 2 and Yowsup 2"
 HOMEPAGE="https://github.com/stv0g/transwhat"
 SRC_URI="https://github.com/stv0g/transwhat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="dev-python/e4u[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/e4u[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	net-im/yowsup[${PYTHON_USEDEP}]"
+	net-im/yowsup[${PYTHON_USEDEP}]
+"
 
 DEPEND="${RDEPEND}"
 
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
 DOCS=( "INSTALL.rst" "README.rst" "USAGE.rst" )
 
 src_prepare() {
 	default
 
-	# Fixes for Spectrum2
+	# Fixes for net-im/spectrum2
 	mv config.py Spectrum2/config.py || die
 	sed -i -e 's/config import SpectrumConfig/Spectrum2.&/' transWhat/transwhat.py || die
 }
diff --git a/net-im/yowsup/Manifest b/net-im/yowsup/Manifest
index f6c6a3af214a..49b8cfd4ecff 100644
--- a/net-im/yowsup/Manifest
+++ b/net-im/yowsup/Manifest
@@ -1,4 +1,4 @@
 AUX fix_newer_six_version.patch 1109 BLAKE2B 0805c79a35d9f49ed3900dfe294bf371c2d1c44b88af7761a6e042665526356e84e7fb00073596c99a37b1b47d3f3bbbbbe1ee2d0332900622a5874001cdc924 SHA512 a8e4689b58b1843eb53befc1f75a868ea43e4e2d6292369948f1d69c918f06b3e2b99c60753ac028ba2b8966e36b7865572f485fd9a7519b7215f163b9765ff2
 DIST yowsup-2.5.7.tar.gz 125732 BLAKE2B 31896cfef601bfe4b65df3518ce6812ad66a98902ec7c8ca5b2ffda15c48c9390010fce58e1158f6ddc325911fd78d1be2bc708d499ab11b725835c5cd5ea246 SHA512 e64e119e8301d6cd9244a24ce960fdd00a5372a7766cf2f52dfd7610828358086e6c4f77fba6f962c1b84f6b28fa6b6d4d708bbb50c281e5a6563b99634b9495
-EBUILD yowsup-2.5.7.ebuild 872 BLAKE2B cb055c3b21432d3114451f0d444a4fc5107e73b0ac79b4d4c7af870cd8d9c459136342b2af30ff2040f8fd79748fdc9e64068bea5eb4ec008852d0ee7f965900 SHA512 15cbb45959822fe511978e1a12b00ccaf10b9d0b6130e04ca89f8ee7d9f99d866fe72f3453ea7aa9abf46d1457ae65ff8c97071a25a9a478d294fdb99531917d
-MISC metadata.xml 874 BLAKE2B 42719d6bff7e94386fcc419fe562d412e3b2876b652b00a26d4d27b81200f7a565d4cea66ed1510907688436aaac47cdf531242f67eeee9e6597634073ad3e31 SHA512 0acd83cef9fd9ab80aa49db19580c53d49d2416e6cb42027bbf86dc10d69e2ad74d2dd61d34bb586fad517d2698e4d9bc90f73cc35265b784d05e56c8380926a
+EBUILD yowsup-2.5.7-r1.ebuild 881 BLAKE2B 6ba4bf0b3e5a3d71bed129931e8e5f081080361f40a38fbe0685b0a13ae9867ecdfb2bd2aadc7179c17c411835859019776bcbde82e5b456d9540be95b8df0cf SHA512 61dfaff6714b18952c0c1d78dd6125de41e2b2a1bb3f5bbcfb7b5d87ebac61c6945741f3b4f66742087ffbbb4e03c0fb03cce34a17cc5e8cde27e80760fa65a0
+MISC metadata.xml 874 BLAKE2B d27417813e16211b395c0680cb1342e4088d8d99c7b7ce904bcae5fce1ee479147cc8c8a3e82069c4fdea61df5ce774c3efc0b528af4080535d12a555e05469c SHA512 ac2e2d245d510785dec9a1979b49c60618815098f6baf1fbb097426ea7ce9c4131c3702d0dc43c5b02c4da4fe7595220a5f9626b6eb386c0f30fe6e1fb20a26f
diff --git a/net-im/yowsup/metadata.xml b/net-im/yowsup/metadata.xml
index dc32909be69f..8494fa26c3e1 100644
--- a/net-im/yowsup/metadata.xml
+++ b/net-im/yowsup/metadata.xml
@@ -9,10 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<upstream>
-		<bugs-to>https://github.com/tgalal/yowsup/issues</bugs-to>
-		<remote-id type="github">tgalal/yowsup</remote-id>
-	</upstream>
 	<longdescription>
 		Yowsup is a Python library that enables you to build applications,
 		which use the WhatsApp service. Yowsup has been used to create two clients:
@@ -20,4 +16,8 @@
 		which was in use by more than 200K users.
 		2) Another fully featured unofficial client for Blackberry 10.
 	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/tgalal/yowsup/issues</bugs-to>
+		<remote-id type="github">tgalal/yowsup</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-im/yowsup/yowsup-2.5.7.ebuild b/net-im/yowsup/yowsup-2.5.7-r1.ebuild
index 862206fd28dd..7c53464c30fc 100644
--- a/net-im/yowsup/yowsup-2.5.7.ebuild
+++ b/net-im/yowsup/yowsup-2.5.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 PYTHON_REQ_USE="readline"
@@ -16,14 +16,16 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="dev-python/configargparse[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/configargparse[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	dev-python/pycrypto[${PYTHON_USEDEP}]
 	dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${RDEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 PATCHES=( "${FILESDIR}/fix_newer_six_version.patch" )
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /net-im
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)