gentoo resync : 13.10.2019

26 files changed, 25 insertions, 327 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 38dfe79a383a..809e6c3960ef 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 895882e9ddc1..a049d9b334cc 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -6,7 +6,7 @@ AUX bitlbee.initd-r1 675 BLAKE2B fb9c803301bb73b1bb6a92d059ca85fbee119849cd27d92
 AUX bitlbee.initd-r2 247 BLAKE2B 066c26d4029571237904fbb7be455b9e1e7d930aedd6a28375fa000ae4146e8e3d7e933213f59ff2bc38958f9c34da8d7da463a7a0cc491e262bbac0491aa30f SHA512 7b9154229c9c5acf8fb480788d665fe8eec6c2038e56a9a24c54ca5ffcff3acaf55614d2ea2d9348f764b8b03b826db9171fe04771affc2636aadd31ac75da38
 DIST bitlbee-3.5.1.tar.gz 680351 BLAKE2B 952a12975d4f95020a5b577603aea791fca754006dc96af3c500d3885b6f2c50cabe51ab698625acb717524a729ef03d18a29aa25bd4815bae2f18fa6298aeea SHA512 4eb3b0d3a92910c8dd789cd23338cc6296bf40212c5244fcb27a88ede10e86424ea59c78e719841863701a7fdd8c61819f2775f7b58833e287d9110e49d036f3
 DIST bitlbee-3.6.tar.gz 534961 BLAKE2B 007681a384fcb2c0736b901dfdc213ba0829ca006ad3204aca1bc4520a3874760867df6165a9218a9deeabb13bc06f118c9e2f804a97e671a348734f6cb7e963 SHA512 ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d
-EBUILD bitlbee-3.5.1.ebuild 3850 BLAKE2B 4118657834b2f7b4239298ce4e569da0ce719189b4bc661321663714063da662d257095ffb1e9d741ba4de98096271638a2e3358409dda09e9a2465dab94d59b SHA512 42f274030a1766cfb03ebf02a2d2099adf04b85b53788e59ecb9428c1c253cc01a431de03083810d30b1ab6f0d3ea531c75468dd34639a97f673b5b7989c6332
-EBUILD bitlbee-3.6.ebuild 3328 BLAKE2B 02ca4eca94e2ef37a92865529f741f640e801ceba2ec49ebaf25c123b6ec56c90ee10e5efd551d0d4d641e374974f21f040fcbaf5170cc6fe845df52b64e40b1 SHA512 4268f755cda2e62e8153c7847deb1bd791713c3dd7d9d6fc74205b28497ec830f765f45ccecc144fcb2ecab8d75df6e7975ed65459b9ed55a152d62b9de86dd4
-EBUILD bitlbee-9999.ebuild 3328 BLAKE2B 02ca4eca94e2ef37a92865529f741f640e801ceba2ec49ebaf25c123b6ec56c90ee10e5efd551d0d4d641e374974f21f040fcbaf5170cc6fe845df52b64e40b1 SHA512 4268f755cda2e62e8153c7847deb1bd791713c3dd7d9d6fc74205b28497ec830f765f45ccecc144fcb2ecab8d75df6e7975ed65459b9ed55a152d62b9de86dd4
+EBUILD bitlbee-3.5.1.ebuild 3840 BLAKE2B 11e507625bf29d9b2c6321dcba4200299c66a1b40ad1b4db6c610dd004c37823111a7f4c60d8522d1a0e011b797eac2d1dae19e75809e2236d88ad1ef5065172 SHA512 5b38e2cdcfd33fa7177bb62fef9367425181784db8733efa28e134233b70b9b282c0edd649ef32301379f4c77ccefaa47d40ca31aad56162f298758e60f946b3
+EBUILD bitlbee-3.6.ebuild 3318 BLAKE2B f8da2b403b59f0607606c93ac3dd8fd356af62c2e306f2b1c12e77b6d325a45e306ca4d6cf1f9fecf79b4bb019bfd3a83b1bed0d6c0469545173aba4656615f0 SHA512 c528cdafe5f2f3da7aa514061b30344184a50c349eb63c18e9d70d11d060b4e52f6d3b87ed44ef755b501f35ee003c06bd2c3fa574a8819e7fdeb8ab9a05559d
+EBUILD bitlbee-9999.ebuild 3318 BLAKE2B f8da2b403b59f0607606c93ac3dd8fd356af62c2e306f2b1c12e77b6d325a45e306ca4d6cf1f9fecf79b4bb019bfd3a83b1bed0d6c0469545173aba4656615f0 SHA512 c528cdafe5f2f3da7aa514061b30344184a50c349eb63c18e9d70d11d060b4e52f6d3b87ed44ef755b501f35ee003c06bd2c3fa574a8819e7fdeb8ab9a05559d
 MISC metadata.xml 1024 BLAKE2B c464379eed693efae5d2de8d5cce454d74285784b328742e8eb8199e0123e57379945d951720210eeb636401696b6a0d71db12ddd7265b56143acf781127537f SHA512 9af5cd2d84cb22d4ee862f11fa352b40b35b365c6552d8c985de2b2bf7202d347c5cd8f14d11880ed164495271eb8bc90f2e4635ccfe3cf0f58be3364a8829ce
diff --git a/net-im/bitlbee/bitlbee-3.5.1.ebuild b/net-im/bitlbee/bitlbee-3.5.1.ebuild
index e1536d6244b4..c6145c59a2f1 100644
--- a/net-im/bitlbee/bitlbee-3.5.1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.5.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz"
-	KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
+	KEYWORDS="amd64 ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="irc to IM gateway that support multiple IM protocols"
diff --git a/net-im/bitlbee/bitlbee-3.6.ebuild b/net-im/bitlbee/bitlbee-3.6.ebuild
index 1108861dd629..4969b10a6334 100644
--- a/net-im/bitlbee/bitlbee-3.6.ebuild
+++ b/net-im/bitlbee/bitlbee-3.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="irc to IM gateway that support multiple IM protocols"
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild
index 1108861dd629..4969b10a6334 100644
--- a/net-im/bitlbee/bitlbee-9999.ebuild
+++ b/net-im/bitlbee/bitlbee-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="irc to IM gateway that support multiple IM protocols"
diff --git a/net-im/centerim/Manifest b/net-im/centerim/Manifest
index 2adc3fdf7f6c..30a0e9d3aff2 100644
--- a/net-im/centerim/Manifest
+++ b/net-im/centerim/Manifest
@@ -1,3 +1,3 @@
 DIST centerim5-5.0.1.tar.gz 764152 BLAKE2B 658db040b539a93d4d45e6e05ae57d209c26008ff2061fa3cae0aa4dfd87ca2f4ee78ca0004cd42e14c9f57b124c885f685028332dcb5b2f4e3bf52cab99f796 SHA512 8d9e7cbb1abc3ed8cd91761ebe9a2355c2e39b59cab23de0ad4bfbbf35f4bce062fee5d01b8239d839fc5cef0c74b31187ab1a85a39c46ef679bfc86e628281f
-EBUILD centerim-5.0.1.ebuild 838 BLAKE2B e7809e064f3863177080f037b46eeb95dd99fedb7595fbf2c02030051fa3982b9a366955650ebaf00432f8a59e973958c8c3bcbf106055342f2844538a51e6ed SHA512 349bd2c7b5a93a24f42f6bba90a1ea2e559190777ac3f6950cf47b86893a818782214191f39d9cfb26bbc9429f6f99ea9c8578968f4914bef64332767a668752
+EBUILD centerim-5.0.1.ebuild 828 BLAKE2B 443f747c2662d93b3e6ebfb9ebaf6f822a24d01ccb5bfe5be1a4b53940fd26555c30f9d339ef45ed0fcaa3d0232a13f891600a390d4b3583b24ab40293e956c5 SHA512 4c37d96b602909a1f4d53e13b6c0afbb2cb9d4c5af9674406e9e0e47bdd0236ef8859cf8c84b5b836b3db0f97b7a71508b40febcdd5e2c2b9a60364a1874d49c
 MISC metadata.xml 216 BLAKE2B ae57b2cbb77ea0f339def04d78473e893d23e5405111b157ba634b09170615c5695970633e0db7f9378eacde7f138a0126da1f278fa634f752d7affcf7a7cfed SHA512 7900b095d94bac2c3c6ed7015ef8c2b695a91762c4800cd2cb6577ff5e2654a107d6b3eed464c16fe1685e23d79071c798d7505cb2789390cd9ca75996330f1f
diff --git a/net-im/centerim/centerim-5.0.1.ebuild b/net-im/centerim/centerim-5.0.1.ebuild
index a98925568fbc..e0696b895232 100644
--- a/net-im/centerim/centerim-5.0.1.ebuild
+++ b/net-im/centerim/centerim-5.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.centerim.org/download/cim5/${MY_P}.tar.gz"
 HOMEPAGE="http://www.centerim.org/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE="debug nls"
 
 DEPEND=">=sys-libs/ncurses-5.2:=
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 90ae40642e8d..6f4a3f837e92 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,6 +1,6 @@
 DIST gajim-1.0.3.tar.bz2 5964743 BLAKE2B af4bf2206a962eb68c4df09359fa3a0ccaca1e886d4fad67d9839f5fd4c1fd359c7ee7933d39d8c1ae7dcbde6b72548fef3564a467653064d4d37aa1db234c04 SHA512 a6d7f92a22a9dddc8a4b07eda0aae0b6fb4db57c73133ee19937f7e2a2a82c5351051d1f3627c94a44434276ed001b83d375f708f177962125af66cda8579ec8
 DIST gajim-1.1.3.tar.bz2 8013585 BLAKE2B 7be25380ecfe76ae5e2a7534665688dcca9ff850c12c7a450e8d1f6caab1820a1022750710df0a8a7ae259c5748f55582b272ad83fbdb0560f18e6ab8642bf78 SHA512 18062832f9b9295c7a844c347d5ece4a6db43126d5b58bbf362fdf2f8e082e2241c46dae6d1cbe66ebf2ef19f65618102c3c21fa0079a96fc21511e6e93420ac
-EBUILD gajim-1.0.3-r1.ebuild 2158 BLAKE2B 678fcfcf7ceb61710fb6c442a5afc243666a7d9181984196a0764b5eced18fabf9701a2678b6176da34939a613b8e861472c1c655bce4a1040b43dcbd5bf06ae SHA512 6b19f4c29d0e40e1b433208b22bd4ea1695a4914258979c79ddefe0c36ff04bbd3678a420fcecd362c36d638aa91e2dcfe0bac5ab86557ed62ed9a686fc66a9a
-EBUILD gajim-1.0.3.ebuild 2156 BLAKE2B 67ffce69962eb4ad091b54dcfaaebcf5fb0a2efb138b033382dad0312fa4132797244a6a74dd98cededb0e1cc429a27c3c0a4056a588ce00b34d239278bf2cd8 SHA512 edccfee6c5019fe6c25f9ae2a4bebc3486b5c64097e7bf06e7628534638f30034636378ca7c977d3d04ceeaefe408281a40a5f88fb0b4bc133e3fdfe974f0049
-EBUILD gajim-1.1.3.ebuild 2304 BLAKE2B a3d88e26614a3c78529e3e3185a38e3c0b623ab419f0d8e1192b41a66e4081e528aecc3d9dcdb0b8ff13d66b9a6037317cb2725c4097d7d3f33f85563e0fa95d SHA512 915b895a22147387ceda12e5cf0d193a15757d1d2f6ad70e2c249ea20e4844f7e9c278915e4edaa2cebafcc65b81f9fdc5b635e774482a6e29a68b1edd034e9c
+EBUILD gajim-1.0.3-r1.ebuild 2148 BLAKE2B 135c3978d3801c2d03aab5e7952524675a5f301a65729f44a530e5b6b55a855bc8dedbf2e8fe0658b0d7d161a6513548fb38bbd0184619782e58fdefcedb27df SHA512 a8f11f0fb95ed5e9fce6a024094e1879ac4013c7f904295697b920dc78147936b20d37ccf28d71001645945de20d323d1826797c38c46c13d4252c31497e0415
+EBUILD gajim-1.0.3.ebuild 2146 BLAKE2B 00516370ba32450dbb7f854252a71c3944a418430ec7e41ea4d23a455a25c619cc2294180ae67b6f865ddc75fb8b39c27210058ab8c038c78d62950e055231d8 SHA512 33e041edda3b5737d7b5865542a7d64224649052373356ec4154da95b035920337e6577ed327232960572475e98f0f95e29d6843f166fd01552b3902b0d258c5
+EBUILD gajim-1.1.3.ebuild 2294 BLAKE2B f358e6f90c1f937887d00bf721ff8926ddc5370d2351ed52ab1a47a3e0d30f6dbff2a38090b9d30603e03688ab8924c843bf54510ccdcba0490fbc51e642fa68 SHA512 06d21f27c6dc3a126bb52428bceaccbc9fc67071902a87284665a8d8aadfd4cf6b3ff21c35bfd160aab6d4495ff1501f207134a7843bb07d493a2c483bb85378
 MISC metadata.xml 1061 BLAKE2B d7e37cec9e291addde0d1c18b155afdadee1225270c7f34f8a916f45ad828353f677f87e6de49994ba14af8cc4773689d7f629f991326e94a43ff36fa9c9b981 SHA512 f9eb4f8a033ca5cca7a2de4a43e98346cf446a20a9257ea95b37d9a6be6051224d55b32272167946c2cbef370cd3c1ddc3b27ce6b8794823d1e9ca9b5ebcac44
diff --git a/net-im/gajim/gajim-1.0.3-r1.ebuild b/net-im/gajim/gajim-1.0.3-r1.ebuild
index 0ea841d01b32..d6499db42187 100644
--- a/net-im/gajim/gajim-1.0.3-r1.ebuild
+++ b/net-im/gajim/gajim-1.0.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}
 
 LICENSE="GPL-3"
 SLOT="0"
-#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 KEYWORDS="~amd64 ~x86"
 IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
 	+webp"
diff --git a/net-im/gajim/gajim-1.0.3.ebuild b/net-im/gajim/gajim-1.0.3.ebuild
index 0727b7f841e2..c7c78054cdc9 100644
--- a/net-im/gajim/gajim-1.0.3.ebuild
+++ b/net-im/gajim/gajim-1.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}
 
 LICENSE="GPL-3"
 SLOT="0"
-#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 KEYWORDS="amd64 x86"
 IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
 	+webp"
diff --git a/net-im/gajim/gajim-1.1.3.ebuild b/net-im/gajim/gajim-1.1.3.ebuild
index 54f26a180bee..ac975f29dde5 100644
--- a/net-im/gajim/gajim-1.1.3.ebuild
+++ b/net-im/gajim/gajim-1.1.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 KEYWORDS="~amd64 ~x86"
 IUSE="+crypt geolocation jingle networkmanager remote rst +spell upnp
 	+webp"
diff --git a/net-im/jabber-base/Manifest b/net-im/jabber-base/Manifest
index 607501b576ad..ccc96fd0f348 100644
--- a/net-im/jabber-base/Manifest
+++ b/net-im/jabber-base/Manifest
@@ -1,3 +1,2 @@
-EBUILD jabber-base-0.01-r1.ebuild 1525 BLAKE2B ee403af798d7b57f66847083d387d1fa874acf95c54643d56734b3d8ab7a78997bc62d3b793d852e53b72ddef8788cf9f3fa205d757c497db236b48fa72b8d9b SHA512 6651e099d29a9aad2a9baccd81a402036a0d946672ded1c606626e718188c4314649804c6e0596b0cbb1b552f07497a7ac5bb8fb28d61ab5003dd20dd4e695f8
-EBUILD jabber-base-0.01.ebuild 1518 BLAKE2B 4b38cd4ed480372ec0189b1157799b833d686ad49bd5a82a749b4823510cfab5340c1b56dadeaa6095358a33548afb2a844073035937363ddd1eb4b2a89c4c50 SHA512 3116d58289fb78e6d191a42e05153e490f1e704456bba7e41e33fd9f0fc9c0598bdcb51bb025d947bd5f23141ed663dfbf135b516a7d972958823597d44c87d4
+EBUILD jabber-base-0.01-r1.ebuild 1506 BLAKE2B 1c94506530ae4b7d8cd4c0b3a98c74c6c44504e1f5053472f742ac3561884dd91dddd8d8ab32660dc07023737b10b5de031c0a15df906a7cb5593b214ed176d3 SHA512 2678a39e9252662c4da114f931f74a881d54df36a310cad3724b53e61938151452067b247d7ede65f42a78409657f728930910e012299e9d6efaed74d25d2404
 MISC metadata.xml 363 BLAKE2B d39b7cb71af89d54bcd663508abec175512058c81d0ecc11cbcf76455e40dbf36c5641bf943266e8f7ce0a7f6bb5807f0fbfe78a2d04054178bf99c15dc1060a SHA512 44bd244e6521f2132804357972d71f92e704471a42828f41b334966d02509c948674aaf20f7c61ff33c2432467cd6b021c30a27bcd851fdedcc7f353903f8462
diff --git a/net-im/jabber-base/jabber-base-0.01-r1.ebuild b/net-im/jabber-base/jabber-base-0.01-r1.ebuild
index 919283672cab..dd01753c31d9 100644
--- a/net-im/jabber-base/jabber-base-0.01-r1.ebuild
+++ b/net-im/jabber-base/jabber-base-0.01-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gentoo.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-im/jabber-base/jabber-base-0.01.ebuild b/net-im/jabber-base/jabber-base-0.01.ebuild
deleted file mode 100644
index a0cbb48beb39..000000000000
--- a/net-im/jabber-base/jabber-base-0.01.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils user
-
-DESCRIPTION="Jabber servers and transports layout package"
-SRC_URI=""
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-
-S="${WORKDIR}"
-
-#Info for people working in jabber related packages
-
-#/etc/jabber/ for configuration files
-#/var/run/jabber/ for the pid files
-#/var/spool/jabber/ for the flat files databases (actually there must be a ewarn
-#at end of ebuild telling user to creat /var/spool/jabber/JID, as some transports fail to start if
-#the directory is not there, even if they have permissions to creat it)
-#/var/log/jabber/ for the log files
-
-#for the python based transports with no install script:
-#they must inherit python and be installed in:
-#$(python_get_sitedir)/$package-name
-
-#the user should be the one created here username=group=jabber
-
-src_install() {
-	keepdir /etc/jabber
-	keepdir /var/run/jabber
-	keepdir /var/spool/jabber
-	keepdir /var/log/jabber
-}
-
-pkg_postinst() {
-	# Users should not be created in src_install see bug #124680
-	# Add our default jabber group and user
-	enewgroup jabber
-	enewuser jabber -1 -1 -1 jabber
-	# We can't use fowners & fperms convenience wrappers as we are outside the sandbox
-	chown jabber:jabber /etc/jabber /var/log/jabber /var/spool/jabber /var/run/jabber
-	chmod 770 /etc/jabber /var/log/jabber /var/spool/jabber /var/run/jabber
-}
diff --git a/net-im/silc-toolkit/Manifest b/net-im/silc-toolkit/Manifest
index ba1ffb07b8ac..32cb9e6fd4fe 100644
--- a/net-im/silc-toolkit/Manifest
+++ b/net-im/silc-toolkit/Manifest
@@ -1,3 +1,3 @@
 DIST silc-toolkit-1.1.10.tar.bz2 1830280 BLAKE2B 9baef6a5684fc29d5255ea7e8a3122a412000c59b1009a69787b21e6320433b1599c9c0962b13d4670b25d83e8e1e908e15dce7931cf07391d82319eeb6a0f38 SHA512 b23b956a79cff6b0471d0fe3b7b57a473272416deaf8546b66987247bef2ee1fc3a8d3db03165a8c3d7f012549f02834d70e3473704e5b39f647a025f4e6befc
-EBUILD silc-toolkit-1.1.10.ebuild 1037 BLAKE2B 0a5d273ef86132acb4a42e5652a715e69e1cdd0d77c006f7753bd80e639f6e35ce55f45cc8486c5834dc8f8baff8bca65a946b77d22d32a3fc81263b5f99d1c6 SHA512 ad06515bc8671d25fc0e19761cfb0d1721bde9d8a2c5b4bd33d83836cb1e847695bec11becf5f3840b054ead604edf59eea0d02ed3382223ed539655497a361a
+EBUILD silc-toolkit-1.1.10.ebuild 1027 BLAKE2B 0e16e97b77890ff704221bf5b45c73cd7816ea24c03e8e4fb60eb00865d6c7f2ff7d1b15cf0960a9d127c0d54fb5d405442d6638826714e97cf02a328806e56f SHA512 996b196aad9241e48410b87e4a83ac0d0f75d026cff5928d2395ef511f691326dd201e120a19d96277d1c522f340b2f66dbca06dc046893a862adce9da2fdd79
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-im/silc-toolkit/silc-toolkit-1.1.10.ebuild b/net-im/silc-toolkit/silc-toolkit-1.1.10.ebuild
index 04aebc9bab9c..f45257175721 100644
--- a/net-im/silc-toolkit/silc-toolkit-1.1.10.ebuild
+++ b/net-im/silc-toolkit/silc-toolkit-1.1.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://silcnet.org/download/toolkit/sources/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug ipv6"
 
 RDEPEND=""
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 44f52e1e55c3..c9cde7823add 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,18 +1,10 @@
 AUX telegram-desktop-bin 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
-DIST tdesktop-1.8.1.tar.gz 14334229 BLAKE2B b049138e544a399470be6ae0d42edb9ecadf54ec23928ce8eb1a6c3326fdcd9e4df363f46dd3c3a1b3c7c3731dbcd2fea4ecaa5decdddb0686088f7c287f6c47 SHA512 129725e87e32b97a9e1fe844cfc489e07bd47a1f54cfa79dbde59f26510fd79e786c39f09fb6cfe11d93059f5d6aa62c8d9a17c7c9d12de88d10ddbaabc940d0
-DIST tdesktop-1.8.2.tar.gz 14335232 BLAKE2B 5a99e2cf4da70d32b5cf3fd2f0c717a59e2aab1d9ac3ce7609d0de8bef7545cc4ef9ac83de0b8d044f68cf7d95c38c232de9838fd591ea2da2430e7e6d900ccd SHA512 6616519b60492886a89702166b80b73a5ca5014d63088d1400d9c8ad14ec2ebf0481a46d12d4e9fc7675b9b484cb19ba2535760d33bc6e5c502115b461d32e5f
-DIST tdesktop-1.8.4.tar.gz 14367314 BLAKE2B 9a2afeec95867142d13d2af68507ac3dd8d813fa4f3d204c806816bf8930fabd93571b8f43afcd2f081aa0d1fa791d92d87c101aebbc36ee95ebfddf0b6cd3ad SHA512 a1f460e145df99dfe769d597b36ed27884b8b012b7e0800fabbef26f5f145d5986ae17b19c0b3bdab5740dde81477f3da2cabd4b4c4d4bdc7b6fe8cb037c56e2
+DIST tdesktop-1.8.13.tar.gz 14416212 BLAKE2B cbce9051a89a5725c3746d14c01f86a8321b6eac6bd9a3026f7e36b100e665e8ed7ae6061187b4f01551bd4ea72ee18b7d050e00bb8171a5f2ff1f90d6f9c686 SHA512 008c08d20936cce95e4bd31c08f4337150daa4451dba9e1a21a1ec2bd5e60125b33ec1ba036aafdd3c931da31186da2e84595683ecbfab0a6006b28a3fcb3e3c
 DIST tdesktop-1.8.8.tar.gz 14407897 BLAKE2B 60b7959b0396d323f962809ec34696f434e25e8ebd0b3c5eb36475df9884b28de17e727c9599e956130fae9bd0dbbe2347c3b5f0e1fe9c9a0f77182441f8d3bd SHA512 8410f8ea31c4e5604c3f9e8965431ec9cf68ec3366da22bb1fc5e745d7518cb49374072ecb70d347714f3f2fefdf882dc05e14ccd4a883b5a96eacf0a87e1c53
-DIST tsetup.1.8.1.tar.xz 33591872 BLAKE2B 6d92087666727b3e1b5ad41bb04c8404c4106d74589dacee63414d588358c88f88a1e6e81c6ee4cd9e47a3b58bcb6b9c4fbd8ef1dbb8aa4a2f13fa2f6aa03991 SHA512 d56e4e3af4aeda409f3743badd5559155c527c10bb780165528c7b9350b40dc95b4658190407389dc3c52b5a1df34ce98dc8038cdfdaa7928f1ec01e16709ea3
-DIST tsetup.1.8.2.tar.xz 33596992 BLAKE2B f8844bfb4168831c5299a52a286b0245aaf8c72e8d161c9dacc45c133a37cccb496d7fb4d37af3fbf6d157737e1b2d7755c06ce696c33e254d8ea120cb18a8c6 SHA512 862ac62593dc47f887e4a438551520ca939898a4584271bc189cf7004b47cf2bede6a5ef6302382bd8a777ffb1afb74fa48fec3b0fa82a447dab43e42718bc84
-DIST tsetup.1.8.4.tar.xz 33754796 BLAKE2B a5e0cdb36372fca70a2c0f9e70bf2ea03b863823bae373787db7b6f544e57218109f585b6f4b61d79cdc9bcc0135ddb94c07235221589f46b60bd6cc80ae88d6 SHA512 833864f88ac6e97c72e31cba87a391890b49c1d59b7f75c36969cb7744576bcfb90188880c07a7196108ce65a004d9d790c66d9a147f3455b4b56129480e3164
+DIST tsetup.1.8.13.tar.xz 34007668 BLAKE2B e70a36e60a3f017c3de0aa4689c199a31e1258d49d8893875763c67afd9801fcaf18b1ea832e6e6014ddb82891e2e9cbc22c3c5710e0769daf78d5fb75493c8b SHA512 b33bd75c4faec1c4c6dec0dc8e294f81510750a7cbd5289ed6507432916e84041bda5624baac0c0dead0896e521f86e8ea19677454c4b816f5c5df03a6211e4c
 DIST tsetup.1.8.8.tar.xz 33840780 BLAKE2B c11b0a8eed1589007dd201883537de9f4ab588d655b56bd708630ef5ab48ad0a4ef2564fd4362740b09847b05c4e0d60bb025652516742b40da9dee148169a2e SHA512 8c2d1047dc6a4eff8ac082e76ceb1af6d9aaad92871d54398db93dd4597a7c2adbdb90b27862bce490955cb702cbf329b8fda0343da4ca1bc683d28551db3da4
-DIST tsetup32.1.8.1.tar.xz 36470956 BLAKE2B 238eafb6aea416bc480b924811941734c64b8695ee2b7d6297eeba5423283cc0d90a4af465e2edbb6952af444d6976f01300cc15758b269df27053aa5e61b7b2 SHA512 e808d5f06d768f732d85eefe60f16829ec6e5ce4df0239520bbd8d3a4a23b67c06e2f389c14388480235188ed372be84a5da7eb89336c827fefc6cbb30e34b31
-DIST tsetup32.1.8.2.tar.xz 36487916 BLAKE2B 6f9ac95ea6bd6565a060ffa5630d2bdb6a21c72962ce01f0811c398e8e630a771a8b24c2eb656686e970fe9801bdfd5f6d1da38ad218e1692c31b8f2a932d20b SHA512 9900241b599e11d0c2de01e50f8f854ea86e1ee3a6353a3edfd333534142372f515bfccb940a00a4af7f8866c96b3f21e2bfc1d56b0e6531cb03727baa8de5c3
-DIST tsetup32.1.8.4.tar.xz 36672836 BLAKE2B 7944c1df95514fbd8380e47f6d7b3f0ff016b6cb3faa73d228a0c86fbdd1d2df49da08f7c899930650452c87c574a9c98ed402cced545775637c4ce0d42a30bc SHA512 e88123048863dea83569017d9a5384954f2d8f6b34f30c42a7b683b2427fb8f0fa38ef3347b4b6b91704e7ea3e6cc9ca3edd3bcde140c5261afcf6f69c8225a7
+DIST tsetup32.1.8.13.tar.xz 38164068 BLAKE2B 5f06efcac65e413cc90c7f60e009178354cc155ccb6362b9779ff9a7f61397dceabcf90ebc975e45a9c3504d640945487dfab64418e09974490d04d36f694df2 SHA512 fcecb19d53e247421aa44325f9b9fd6c14fd90db0b3c3fadf0e5e9b8a9413d0e44679de3869f141122208c07519d544e188b6a8bd6a434d1b03a982aefadae09
 DIST tsetup32.1.8.8.tar.xz 36820924 BLAKE2B 942dba2ca043aefde7a256f402cb702cf42cd8eaa043a776effa747d0922fb0cc53007af87918ae3c8ce55545e390462529e4ad4ffdcb297e5f2f92d74154140 SHA512 4a6aeee0f287bfb1d1cdfe16b5ea4185133dc68233210c21aff928a6995908cd4e6088080226339c86e7514eb1d6722031451749f3520b620ea173d79a4c99ad
-EBUILD telegram-desktop-bin-1.8.1.ebuild 1154 BLAKE2B ab2ba32e4c9c30027481cbc6e477df91397d8d0c9c5c0a0a3b6cbdab39e8817a1836a7053d59c8339f33f0c1f3fec9953b3fd092654b3076ea9f2f5da432ae36 SHA512 67729a225944fd367b22013fe2f8b1df27a9bab46047071053f5416566f47101d261756fb138822c47ffd84dd26d766a1e4eb78be762814d46a1e589c3bb9f2f
-EBUILD telegram-desktop-bin-1.8.2.ebuild 1154 BLAKE2B ab2ba32e4c9c30027481cbc6e477df91397d8d0c9c5c0a0a3b6cbdab39e8817a1836a7053d59c8339f33f0c1f3fec9953b3fd092654b3076ea9f2f5da432ae36 SHA512 67729a225944fd367b22013fe2f8b1df27a9bab46047071053f5416566f47101d261756fb138822c47ffd84dd26d766a1e4eb78be762814d46a1e589c3bb9f2f
-EBUILD telegram-desktop-bin-1.8.4.ebuild 1154 BLAKE2B ab2ba32e4c9c30027481cbc6e477df91397d8d0c9c5c0a0a3b6cbdab39e8817a1836a7053d59c8339f33f0c1f3fec9953b3fd092654b3076ea9f2f5da432ae36 SHA512 67729a225944fd367b22013fe2f8b1df27a9bab46047071053f5416566f47101d261756fb138822c47ffd84dd26d766a1e4eb78be762814d46a1e589c3bb9f2f
+EBUILD telegram-desktop-bin-1.8.13.ebuild 1154 BLAKE2B ab2ba32e4c9c30027481cbc6e477df91397d8d0c9c5c0a0a3b6cbdab39e8817a1836a7053d59c8339f33f0c1f3fec9953b3fd092654b3076ea9f2f5da432ae36 SHA512 67729a225944fd367b22013fe2f8b1df27a9bab46047071053f5416566f47101d261756fb138822c47ffd84dd26d766a1e4eb78be762814d46a1e589c3bb9f2f
 EBUILD telegram-desktop-bin-1.8.8.ebuild 1154 BLAKE2B ab2ba32e4c9c30027481cbc6e477df91397d8d0c9c5c0a0a3b6cbdab39e8817a1836a7053d59c8339f33f0c1f3fec9953b3fd092654b3076ea9f2f5da432ae36 SHA512 67729a225944fd367b22013fe2f8b1df27a9bab46047071053f5416566f47101d261756fb138822c47ffd84dd26d766a1e4eb78be762814d46a1e589c3bb9f2f
 MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.8.1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.8.13.ebuild
index 6564f90ef88c..6564f90ef88c 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.8.1.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.8.13.ebuild
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.8.2.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.8.2.ebuild
deleted file mode 100644
index 6564f90ef88c..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.8.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop 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="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-QA_PREBUILT="usr/lib/${PN}/Telegram"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	>=media-libs/fontconfig-2.13
-	>=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} "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
-}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.8.4.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.8.4.ebuild
deleted file mode 100644
index 6564f90ef88c..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.8.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop 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="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-QA_PREBUILT="usr/lib/${PN}/Telegram"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	>=media-libs/fontconfig-2.13
-	>=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} "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
-}
diff --git a/net-im/yowsup/Manifest b/net-im/yowsup/Manifest
index eaf8ad513e6d..f954cce3b681 100644
--- a/net-im/yowsup/Manifest
+++ b/net-im/yowsup/Manifest
@@ -1,9 +1,4 @@
-AUX yowsup-2.5.7-add-python3.7-support.patch 2535 BLAKE2B 261373abd08c5a3eb46267755c8f57000742c442074ee578db5f3f64f9def59e1aae3dc74722706d86bbad62f1cff8d2b7b54cf20153d04c7ce9522c4a9334b0 SHA512 b35b52a0f5e2e5a766b11f2360e6bd17e95ac9c8065a711a9cdad829fb2e5f2109e232a24dab9be1bfd4e2f082d1e20b2b799ea9c4f5987bfbf8f90d16450c60
-AUX yowsup-2.5.7-fix-install-path.patch 1006 BLAKE2B 984570abfac5056ddd3ac9d9dc89ebf75bd43f724f9f9278dde5099d09300588a7be7e8ce8aba5f1241f115d24e9405f55606ed729a0a2a379c606d494bab330 SHA512 53bdf45df4b09bc669e8a7edd413d77cd42258da653f6fbaea82e2d6cc10d1bf4ff0acfa8e463ad3c509fb59672e59995eb7f3351fb744386bfdc9f82bc56c08
-AUX yowsup-2.5.7-fix-newer-six.patch 1109 BLAKE2B 0805c79a35d9f49ed3900dfe294bf371c2d1c44b88af7761a6e042665526356e84e7fb00073596c99a37b1b47d3f3bbbbbe1ee2d0332900622a5874001cdc924 SHA512 a8e4689b58b1843eb53befc1f75a868ea43e4e2d6292369948f1d69c918f06b3e2b99c60753ac028ba2b8966e36b7865572f485fd9a7519b7215f163b9765ff2
 AUX yowsup-3.2.3-fix-install-path.patch 819 BLAKE2B da850faf959e8d3fa1009c525fc5811d62a90f04a4e65585ac4926d9146125e0a8a3abfc1828513c3831df65c9964c80262d9e6173ccfc3cd1c07acd262ac53a SHA512 fcbee788e2e2d077b5bba3b301ae98603680542615079c1d248338a92fccec8548a5987599dc2923318f5bfb83904c97e8952f881ca18e3c2bbee0dd60e7d474
-DIST yowsup-2.5.7.tar.gz 125732 BLAKE2B 31896cfef601bfe4b65df3518ce6812ad66a98902ec7c8ca5b2ffda15c48c9390010fce58e1158f6ddc325911fd78d1be2bc708d499ab11b725835c5cd5ea246 SHA512 e64e119e8301d6cd9244a24ce960fdd00a5372a7766cf2f52dfd7610828358086e6c4f77fba6f962c1b84f6b28fa6b6d4d708bbb50c281e5a6563b99634b9495
 DIST yowsup-3.2.3.tar.gz 140038 BLAKE2B 45df9151e897eea4f2997246d8c66409bc58160e01a84ee632f3e834058efcaed1d03047ddc6e8e7acbaa566d5fab2451fb21b30daf477bc83dfdd0bee7e6b59 SHA512 a1be36df5dc632071385cf0e252a208efb8982df98966d2c5a7b7558c626112e1ac2688be25fb6de1db9e9e04d36ab96784e589aeb90fcc6c6770edac791e568
-EBUILD yowsup-2.5.7-r2.ebuild 974 BLAKE2B d0438a3c6f3a3a84e94ae36ffa969325bbc34567ba60a739e146566cb3ca868a185971f4fa1e0f5abfda930718aae514b3097f3a6cf6bb012c5589cd3ad2317d SHA512 b9702cda815423840009e43d00ea6213526deef314cdcf7f6becfe25ae79fb043d8bdda51b4973f493a898a346bbf9b1d80b5de9b79a37d7dfed43a3606051fe
-EBUILD yowsup-3.2.3.ebuild 1207 BLAKE2B 876cffd9fcfb8aa71d5c3244c074c75cc253ef15a2d8104d314d64c6f793aace0263ef86d18e3a37b0038fa0c59ef9bcf587a61c3d3ec85b5c86df6667935786 SHA512 bacaa306fa370b579c5647b1b689d30018f866486f48e777ae0477e870a9e15682f70cb1a8fefc716758ab6868eccc5f3a3ae04d35e5ef7a942ab85a5a22b6f3
+EBUILD yowsup-3.2.3.ebuild 1205 BLAKE2B 17efa23d4f6da48ca7f9d6be30d567a939d4da463e4be732144a2618b2b971c4a6fbf276bbf90c44f8ec4bf2e7ce4662dcfea293ce01a0a9c90f192b1022f166 SHA512 1b1e2463b56133061bfc9e76ea8aeee2d052797c39d2fe9eaaa276e8b4d079b015a56bef2cee375731fb239d238132ebcd1ca7fa1ef84a4ee6d6ab736c5817e8
 MISC metadata.xml 874 BLAKE2B d27417813e16211b395c0680cb1342e4088d8d99c7b7ce904bcae5fce1ee479147cc8c8a3e82069c4fdea61df5ce774c3efc0b528af4080535d12a555e05469c SHA512 ac2e2d245d510785dec9a1979b49c60618815098f6baf1fbb097426ea7ce9c4131c3702d0dc43c5b02c4da4fe7595220a5f9626b6eb386c0f30fe6e1fb20a26f
diff --git a/net-im/yowsup/files/yowsup-2.5.7-add-python3.7-support.patch b/net-im/yowsup/files/yowsup-2.5.7-add-python3.7-support.patch
deleted file mode 100644
index 6d3f3c83004e..000000000000
--- a/net-im/yowsup/files/yowsup-2.5.7-add-python3.7-support.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: Fix compatibility with Python 3.7 since async has become a reserved word
-Author: Josue Ortega <josue@debian.org>
-Last-Update: 2018-07-29
-
---- a/yowsup/demos/cli/layer.py
-+++ b/yowsup/demos/cli/layer.py
-@@ -559,7 +559,7 @@
-             mediaUploader = MediaUploader(jid, self.getOwnJid(), filePath,
-                                       resultRequestUploadIqProtocolEntity.getUrl(),
-                                       resultRequestUploadIqProtocolEntity.getResumeOffset(),
--                                      successFn, self.onUploadError, self.onUploadProgress, async=False)
-+                                      successFn, self.onUploadError, self.onUploadProgress, asyncronous=False)
-             mediaUploader.start()
- 
-     def onRequestUploadError(self, jid, path, errorRequestUploadIqProtocolEntity, requestUploadIqProtocolEntity):
---- a/yowsup/layers/interface/interface.py
-+++ b/yowsup/layers/interface/interface.py
-@@ -125,7 +125,7 @@
-             mediaUploader = MediaUploader(builder.jid, self.getOwnJid(), builder.getFilepath(),
-                                       resultRequestUploadIqProtocolEntity.getUrl(),
-                                       resultRequestUploadIqProtocolEntity.getResumeOffset(),
--                                      successFn, errorFn, progress, async=True)
-+                                      successFn, errorFn, progress, asyncronous=True)
-             mediaUploader.start()
- 
-     def __onRequestUploadError(self, errorEntity, requestUploadEntity, builder, error = None):
---- a/yowsup/layers/protocol_media/mediauploader.py
-+++ b/yowsup/layers/protocol_media/mediauploader.py
-@@ -9,10 +9,11 @@
- logger = logging.getLogger(__name__)
- 
- class MediaUploader(WARequest, threading.Thread):
--    def __init__(self, jid, accountJid, sourcePath, uploadUrl, resumeOffset = 0, successClbk = None, errorClbk = None, progressCallback = None, async = True):
-+    def __init__(self, jid, accountJid, sourcePath, uploadUrl, resumeOffset=0, successClbk=None,
-+                 errorClbk=None, progressCallback=None, asyncronous=True):
-         WARequest.__init__(self)
- 
--        self.async = async
-+        self.asyncronous = asyncronous
-         self.jid = jid
-         self.accountJid = accountJid
-         self.sourcePath = sourcePath
-@@ -30,7 +31,7 @@
-         self.sock = socket.socket()
- 
-     def start(self):
--        if self.async:
-+        if self.asyncronous:
-             threading.Thread.__init__(self)
-             super(MediaUploader, self).start()
-         else:
diff --git a/net-im/yowsup/files/yowsup-2.5.7-fix-install-path.patch b/net-im/yowsup/files/yowsup-2.5.7-fix-install-path.patch
deleted file mode 100644
index 63b0fbfc91c9..000000000000
--- a/net-im/yowsup/files/yowsup-2.5.7-fix-install-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Fixes wrong installation of mime.types file.
-Author: Josue Ortega <josue@debian.org>
-Last-Update: 2016-09-04
-
---- a/setup.py
-+++ b/setup.py
-@@ -33,7 +33,7 @@
-     #long_description=long_description,
-     packages= find_packages(),
-     include_package_data=True,
--    data_files = [('yowsup/common', ['yowsup/common/mime.types'])],
-+    #data_files = [('yowsup/common', ['yowsup/common/mime.types'])],
-     platforms='any',
-     #test_suite='',
-     classifiers = [
---- a/yowsup/common/tools.py
-+++ b/yowsup/common/tools.py
-@@ -150,7 +150,9 @@
-         return preview
- 
- class MimeTools:
--    MIME_FILE = os.path.join(os.path.dirname(__file__), 'mime.types')
-+    # Replaces mime.types path for the debian path installation
-+    # MIME_FILE = os.path.join(os.path.dirname(__file__), 'mime.types')
-+    MIME_FILE = os.path.join('/usr/share/yowsup/common', 'mime.types')
-     mimetypes.init() # Load default mime.types
-     try:
-         mimetypes.init([MIME_FILE]) # Append whatsapp mime.types
diff --git a/net-im/yowsup/files/yowsup-2.5.7-fix-newer-six.patch b/net-im/yowsup/files/yowsup-2.5.7-fix-newer-six.patch
deleted file mode 100644
index d1bfb27ce295..000000000000
--- a/net-im/yowsup/files/yowsup-2.5.7-fix-newer-six.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/setup.py	2017-12-30 00:12:35.000000000 +0100
-+++ b/setup.py	2018-04-29 20:51:23.000000000 +0200
-@@ -5,7 +5,7 @@
- import platform
- import sys
- 
--deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six==1.10']
-+deps = ['python-dateutil', 'python-axolotl>=0.1.39', 'six']
- 
- if sys.version_info < (2,7):
-     deps += ['importlib', "protobuf==3.4.0"]
---- a/yowsup/env/env.py	2017-12-30 00:12:35.000000000 +0100
-+++ b/yowsup/env/env.py	2018-04-29 20:51:44.000000000 +0200
-@@ -13,7 +13,6 @@
-         super(YowsupEnvType, cls).__init__(name, bases, dct)
- 
- class YowsupEnv(with_metaclass(YowsupEnvType, object)):
--    __metaclass__ = YowsupEnvType
-     __ENVS = {}
-     __CURR = None
- 
---- a/yowsup/layers/protocol_media/picture.py	2017-12-30 00:12:35.000000000 +0100
-+++ b/yowsup/layers/protocol_media/picture.py	2018-04-29 20:52:30.000000000 +0200
-@@ -1,5 +1,5 @@
- from yowsup.layers import YowLayer
--from yowsup import ProtocolTreeNode
-+from yowsup.structs import ProtocolTreeNode
- from .mediadownloader import MediaDownloader
- import shutil, os, logging
- logger = logging.getLogger(__name__)
diff --git a/net-im/yowsup/yowsup-2.5.7-r2.ebuild b/net-im/yowsup/yowsup-2.5.7-r2.ebuild
deleted file mode 100644
index 1b4eb9ea9533..000000000000
--- a/net-im/yowsup/yowsup-2.5.7-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-PYTHON_REQ_USE="readline"
-
-inherit distutils-r1
-
-DESCRIPTION="A library that enables you to build applications which use the WhatsApp service"
-HOMEPAGE="https://github.com/tgalal/yowsup"
-SRC_URI="https://github.com/tgalal/yowsup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/configargparse[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${P}-add-python3.7-support.patch"
-	"${FILESDIR}/${P}-fix-install-path.patch"
-	"${FILESDIR}/${P}-fix-newer-six.patch"
-	)
diff --git a/net-im/yowsup/yowsup-3.2.3.ebuild b/net-im/yowsup/yowsup-3.2.3.ebuild
index 69b80264ed28..8616e38519ee 100644
--- a/net-im/yowsup/yowsup-3.2.3.ebuild
+++ b/net-im/yowsup/yowsup-3.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tgalal/yowsup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]