gentoo resync : 04.08.2018

13 files changed, 162 insertions, 313 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 151997a47797..bfcd8322bf9d 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/err/Manifest b/net-im/err/Manifest
index c537865d6855..21f5abda208a 100644
--- a/net-im/err/Manifest
+++ b/net-im/err/Manifest
@@ -1,5 +1,8 @@
 AUX errd.confd 167 BLAKE2B b55dc0ba17dfc50d6958ee7a547f1db1dfcedec6d117507b5a7b50070c770f9dccdcf30b40b214492d92a4239c5ec253c630b35c218e315df57e92d700a758af SHA512 0e8f6b86cfe3e57dbae2ecf7a035d084ac753c338871fe51462d522465777f5c8886a9a2fa7d69030ed53797b6ece89a3e3453162d5a9af76a5e1a2ac23db30f
 AUX errd.initd 678 BLAKE2B 76486bbc011676007c36e5b23cd175e3ebb10fde822c9e92191b431ff83737fe07446cbddbc19dadddf6a40f324b889229fccfac15592ad0ed12d60c43d7b8d0 SHA512 c7a32d4d81f7f9bc6a598796b0b219e6c6b3187e0fcb9035824cf183b98e4ac95688c106e594f72ab09260d1c5bdc02e09e976e04674b58549d91e2a801752cb
+AUX errd.initd.2 512 BLAKE2B 48eed9e9e2bd5c1f23c63bbae10750c8e638c4f6ce286dc7e56799a45f986dbdcd359ee9f6c06e9bc33bd249c41ea08f0e6692f47b17229b9e7eb51e52d0f6e5 SHA512 caa47f7252c3ff04c47ed6c3174e4121dd600d1f4601f8a08275d1bc072e25f3b6125ba73d6c9c90af67dcc72da3ffbe875c83f756d75208af916a5d7ef672fb
 DIST err-1.7.1.tar.gz 100716 BLAKE2B 6d47ec4e632210ed313342075f87e1857460b57dc9b32d4487b2980c9c99e2a852d27ae7a5c87ee6d8bc4bcd15577ca11934111f27c81979f8aca9d14223212d SHA512 5be7f6ede6694877e73226de4da58bc47e1230032bc9be8dd3e8fd1448afd1e3ae4c02ecbdb30343b98466bb0d3a8fbfbcb6609c5c50768a9be70b9d22f675a4
+DIST errbot-5.2.0.tar.gz 189305 BLAKE2B 96e275ee2a70fcab217f4a91c855192d8536cc177e0cafe08c8f55e17a09c06913c07e50473f87ea29e4537cd6389907615eba86d44756962ed59a87498be398 SHA512 d879e9da6647d697ead0a5f72fe83cf33614201863a9a62bc62c90d7ac0478e1e0902438c6f053d2ea56c940d68b136bbfa497175fb11647913bd7f139220aec
 EBUILD err-1.7.1-r2.ebuild 1949 BLAKE2B ef9089cfa7d5f25b2f6d40d856f41f6cdb204986094750f499f6e0adfd9d3938ef71f415f5672a718d1b339c1082e8ccbf9e5e742312ffbfa74531a8f8360447 SHA512 e4ac8a7fde302d6b7192cfb17f65f1df3b9aa7ec2508c1b3b0ef1c5c97ae2baa58a25d45c91f10c900167e0ec6774773e4bb145845e057f38140cbacbe6eda46
-MISC metadata.xml 689 BLAKE2B 095d0e9a4e0da1798fa3fc707bccd9e38a238e8658da288005f665e05f3f7e386beedeec95dabaeed0f7d2980f11b26549785a615ddf63cd4c757ecd41759954 SHA512 dfc61dbf4405fee8f0494a7872d1fc86e9b34cf5e12e133b88a9041301cca69606b1e26ba8249c0341fb148890b70058f9bcb1a875c1cd742e9559e3bcc1df36
+EBUILD err-5.2.0.ebuild 2260 BLAKE2B 0fb41b5b311d5e53766543f806128e0154ba69fcb0a60db57d9dc73aff5726532e576c87da1badb343d09e24acbae58ce407a7e779de3f3487daec51e3622edc SHA512 dbd4b95ce2536ef1e0df5ba6ee02f57bf58d06ffac44de51f71364d9659bd103c1f9099dbb8b037ba08559bfbcecf6b04fdae595b4785b61c09adde6464db7f2
+MISC metadata.xml 661 BLAKE2B a381883c6d8d05f2baee14c9babde38553e7a28c9e88a46ccba3e03015f7de847c8f76fbb45997462eba11b8f0d3d81fcbb98ac7fca4e84b193e4a6b1dbb0cf6 SHA512 7ad90d101045ca2175dd6af80209341b34ac46aae952150a0efe43ed34b1bd96032c3fd62660b185987f49e6b3a66d4411b1ffbb4b56ab6035c21cf8e290c00a
diff --git a/net-im/err/err-5.2.0.ebuild b/net-im/err/err-5.2.0.ebuild
new file mode 100644
index 000000000000..56e859063a4d
--- /dev/null
+++ b/net-im/err/err-5.2.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_5,3_6} )
+
+MY_PN="errbot"
+MY_P="${MY_PN}-${PV}"
+
+inherit distutils-r1 user
+
+DESCRIPTION="Multiprotocol chatbot designed to be easily deployable and maintainable"
+HOMEPAGE="http://errbot.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="irc +xmpp"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/ansi[${PYTHON_USEDEP}]
+	dev-python/bottle[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/daemonize[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/webtest[${PYTHON_USEDEP}]
+	dev-python/yapsy[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	irc? (
+		dev-python/irc[${PYTHON_USEDEP}]
+	)
+	xmpp? (
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/sleekxmpp[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# NOTES:
+# 1. Support for BOT_SENTRY option is missing, cause
+#    we do not have apropriate packages in portage yet
+# 2. Currently only XMPP is supported(IRC still untested)
+# 3. Internal web server is temporarily removed (rocket-err from requires.txt)
+# 4. pygments-markdown-lexer dependency(needed only for debugging?) is temporarily removed (pygments-markdown-lexer from requires.txt)
+
+pkg_setup() {
+	ebegin "Creating err group and user"
+	enewgroup 'err'
+	enewuser 'err' -1 -1 -1 'err'
+	eend ${?}
+}
+
+python_prepare_all() {
+	sed -i \
+		-e '/rocket-errbot/d' \
+		-e 's/dnspython3/dnspython/' \
+		-e '/pygments-markdown-lexer/d' \
+		setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}"/errd.initd.2 errd
+	newconfd "${FILESDIR}"/errd.confd errd
+
+	dodir /etc/${PN}
+	keepdir /var/lib/${PN}
+	keepdir /var/log/${PN}
+	fowners -R err:err /var/lib/${PN}
+	fowners -R err:err /var/log/${PN}
+
+	insinto /etc/${PN}
+	newins errbot/config-template.py config.py
+}
diff --git a/net-im/err/files/errd.initd.2 b/net-im/err/files/errd.initd.2
new file mode 100755
index 000000000000..460cd070f54d
--- /dev/null
+++ b/net-im/err/files/errd.initd.2
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/errbot -u ${ERR_USER}:${ERR_GROUP}"
+command_args="-d -p ${ERR_PID_FILE} -c ${ERR_CONFIG_PATH}/config.py"
+pidfile="${ERR_PID_FILE}"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	# create piddir if necessary, bug #448498
+	local piddir=$(dirname ${ERR_PID_FILE})
+	checkpath -q -d -o err:err -m 0770 "${piddir}" || {
+                eend 1
+                return 1
+        }
+}
diff --git a/net-im/err/metadata.xml b/net-im/err/metadata.xml
index e6e55f5a3b8c..93446d15f5a7 100644
--- a/net-im/err/metadata.xml
+++ b/net-im/err/metadata.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>pinkbyte@gentoo.org</email>
-    <name>Sergey Popov</name>
-  </maintainer>
-  <use>
-    <flag name="irc">Pull optional dependencies, needed for IRC backend</flag>
-    <flag name="plugins">Enable support for installing plugins with <pkg>dev-vcs/git</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="github">gbin/err</remote-id>
-    <maintainer status="active">
-      <email>gbin@gootz.net</email>
-      <name>Guillaume BINET</name>
-    </maintainer>
-    <remote-id type="pypi">err</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<use>
+		<flag name="irc">Pull optional dependencies, needed for IRC backend</flag>
+		<flag name="plugins">Enable support for installing plugins with <pkg>dev-vcs/git</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">gbin/err</remote-id>
+		<maintainer status="active">
+			<email>gbin@gootz.net</email>
+			<name>Guillaume BINET</name>
+		</maintainer>
+		<remote-id type="pypi">err</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest
index b3a3f51290be..f2620d308cb3 100644
--- a/net-im/mattermost-desktop-bin/Manifest
+++ b/net-im/mattermost-desktop-bin/Manifest
@@ -1,21 +1,5 @@
-DIST mattermost-desktop-3.5.0-linux-ia32.tar.gz 48847084 BLAKE2B e7fb0b540b67d75826aed9588e2dc789b956092d7891877f68b659ff865b2dc5af08adf1642c502d6c85bab6280c30d14c45e63e618c1cda7b1b1808f0ce1bb1 SHA512 cdb363ca5c13090ec484976a55efdc398549d6cfaefe19619443433f0cd8382ef00b1a65dc3e82caf4b7b7535e903392e9a51abcece131d4ea9c31661c024e99
-DIST mattermost-desktop-3.5.0-linux-x64.tar.gz 47617590 BLAKE2B f4789c3d910afe50d78d8493321c286a80c83fb58c6a3687b1954971d34a6ea62ef77b26295ea5c8b1a3e97c75c38d3f7096d6edf46084c8623744bb23e66351 SHA512 b9bd3a9c3e3c63fd45764916acbde863c9297b9c6a5fcf6f6321d19945709b6f8d50842bec880d003c0ca5555bde0d46725a485557f8cbfb36fdf36875915f13
-DIST mattermost-desktop-3.6.0-linux-ia32.tar.gz 48965181 BLAKE2B c5d09b48d965ab37546ba05bff61864852e1f045aa878921d6631082a8a8da352320dbf6f9d9f83179ea05452d1441bff0be55a62aa91680a85ee4c68a3ec590 SHA512 bfe521f7abb0883e9126f8aaa53adaa066d838f30a7c2a04eb120c04ce62e4cee30e23636b202f413bba8d7ea1289ebedc1bf4485098470aa3a9b07844a94bf3
-DIST mattermost-desktop-3.6.0-linux-x64.tar.gz 47733150 BLAKE2B a90b81cf9c99b1cf7c5120a0c4c782c1eccf8553ff3f4c51e3237c01134584538bc7a3bb40a68c9e203c9e0dce69d07f67b32828089a519dd35287e241f9bd82 SHA512 4f5226f666c798455f2f8702027269b02f72a581dc3d5759727dd70f7a974c9eb9aec418d0b89fdfe2fa3cdf208bd277dca8e684f2e158d2cdb95be9657fe9d1
-DIST mattermost-desktop-3.7.0-linux-ia32.tar.gz 57552057 BLAKE2B 7f543512d4fab0ad129223d2fa89f4faefd7bca6953fb73407e35f4334f21c4c1e8d96f81ad067e280aa40c2b21db19b7bce13fce2f6d85823631cb0e31e400b SHA512 159e81dd0cf259cf32ca1b55905579df1b0227dd423a2fa71ee3b1c297ca8ca935ff4fba729e512edbc58358caa8dd1b1f5d565045b8cb56c49f1220c5092a72
-DIST mattermost-desktop-3.7.0-linux-x64.tar.gz 56145589 BLAKE2B bebc6ac1e3a4cf3593525008722d74069c28ca73ff489df32fd99aae2ebebde5c96aa13a8fd4db7623afaa69663fefd1b35b43d9238f044c525f5b844ef5cec8 SHA512 f46f13045850579c49a87ab2a01caf3c3d95ac6bb9bc807c414413df6804ea36342bbc0a31a75d10a3b048dc3ac5a3efe8c26883c0705aec8875900366b9b58a
-DIST mattermost-desktop-3.7.1-linux-ia32.tar.gz 58727870 BLAKE2B 536164e41832e35404089a0e0866ce0b5ed49f7253d85669e02b0f6054274a49d13df1ec5b2cc08e14e0a065c4b75ba6c6b807de61056915b5401cea8fbd847d SHA512 679aed097874fea7c245cb4d939065b3d42804a972b2d4593f1d3325b0e9208fe9c1b57c0d0b969ca2a4a5a00a8ee82735bef69eb82151932d1753b69ece3d2f
-DIST mattermost-desktop-3.7.1-linux-x64.tar.gz 57327001 BLAKE2B 12d863139ef65ac2abf8191c1241fb0f6f8c3a1e7c6225e4a9361eb047ea06487f6f1e9f8b9e145f5c29cc818df1cd6a7c0d272f6ad76a9651bd7d99aed871f5 SHA512 4f709f3377b82e959a553c36932c18662c391a8f6a61a56df227b0f6054569c391a04dba9d071eaa35e9736ec49a2d1ae5339a8962d2476c338344ec977cd64d
 DIST mattermost-desktop-4.0.0-linux-ia32.tar.gz 61337701 BLAKE2B 5e5e2cf40c9f28c3d8384b8a6cffccf8c691bacef3f86d739fba9fda600f39135d48e48fe1d05f73d1e862b83a05931b4dd299e9c18c6e29251e5438d9f8b112 SHA512 0991010a3288ee1c75e5a4ffe40f0daa0c4c180edca6bf8a956e4a2baf97b4e76d4f503a12c0517cdeb0e93e742821fe131367501891046ec6d11336afd05f09
 DIST mattermost-desktop-4.0.0-linux-x64.tar.gz 60248946 BLAKE2B 20f70c6a333d5dad57030076db22dca5a82509713aec1e68e1decbf29057418fc3b738f50c93961828f714f1988b8069062a4ea9cab4750bd1552fad4805a0e8 SHA512 fb470a072b21f53c5b4e5197a6b3c124cbff27302d5612fa04df60f043e85fcefc575c2c7feb8ecc5a842400bac5291fff8b9b3f563abd17437f4e33d7e7421f
-DIST mattermost-desktop-bin-3.5.0.tar.gz 763198 BLAKE2B 843c997fbe8145fda87b6d78fa4ccb16daa752443eb024427c520601faa07da16a6737232090d0cd8b2c0c7ce73811396a6ac568b136237526f0fd7c2b17f7a2 SHA512 06924e4ce18cbe8fd50c0742a74b0a2ec732c7a419bb741c6991097a0a7be01afdfc4ce43125856508aa06750e35d12ce34d06a1e5d6eb6ddd14e81a0a6dffba
-DIST mattermost-desktop-bin-3.6.0.tar.gz 769891 BLAKE2B 0fcfef0ea4235abffa67451df7583789532185311018c252f75432538a5fedd810e4e22badc8d3ea794944a1b195e93f2cc1712cf323a8674c9ee6e951547d57 SHA512 ef781d4d9823642b767705c4182a38414e457978f775c3042ab72a9cf71c82c7c557193e333d18bdfc69cdcc647c39d0a52a666d72aabfbb848940af2d400710
-DIST mattermost-desktop-bin-3.7.0.tar.gz 817335 BLAKE2B bec8dc420473b162ca440b0de1fdf9eebf0ec9d710fd85b86050f117d31155a3caee6949e61d6a510d287302aa1851001a88ba5f2f2dbaaa3a71cab7a10ad655 SHA512 3abcd3078adf74922bd31e6e975afd66f2f335f73017f3153cabd6cb38d8a36d9e9a01a1d572f34d123f4e68ed47280901fa3490e90ca04bbd2002cefb912f2f
-DIST mattermost-desktop-bin-3.7.1.tar.gz 817296 BLAKE2B 43b64b243ba170607581ad0389078bf602c40f7ed05c3c9dda7b6ba167933817ec2d30b500cfd0d44527a0a202d4d27c88d090f5368579c01a71a1efee3a5f27 SHA512 92a545c823df644e6bb49712c67770fda606644d32ae3501d903223a1d3851f8bc7a55f86aa67f5df1dafcef5f87d438845ac722e44b074acb7b645accde8ae0
 DIST mattermost-desktop-bin-4.0.0.tar.gz 1217683 BLAKE2B fdd9d2798d90e335c0d125d9df1b81007639b5de61a3b4d10a1a2bda237ddc1c2abbc20aa6259710172f0b9c673297a76ae9abc6226fd8c39c417084dddbe440 SHA512 35ee82de509416fbd9abfe8f519e3b7461da4978dc4df86f82f433edef6e4d575adaac6d9f95ad11bac5d6cda7830c45cdf517d6e8af969751a387915ed1bade
-EBUILD mattermost-desktop-bin-3.5.0.ebuild 1296 BLAKE2B c8aeb5f98bc84f4b883fc72fe547b7f61b863bb3d57f67336cf059efc6d15e0405e1298ecbe3b48117a72002d87cd41d8b13f2f05f89ce414994d34ae8830a99 SHA512 8c37ab8e2c3eca57ae54a8be771fe0f33611ab817c94d9220016390436f1caefed020612364cd15634916a0a67205f3c8909124ab25a219aec6a0c5186de5702
-EBUILD mattermost-desktop-bin-3.6.0.ebuild 1296 BLAKE2B b185d0f1eb8ac4250963dfacf3df1254b0bee8a7d19b3eea5e568c1b01edbb2681016c66f79617cfedc198312f1888560caa97b26c7d673a9202c29cb983fc01 SHA512 ded3d617cd8e0306722578e86cb150a6a8946ec7b7517d322f3aec8dd63ed906a547756119138454716be2462a3433f4817b49aa6ceaa0c952c4a84600a5ad63
-EBUILD mattermost-desktop-bin-3.7.0.ebuild 1290 BLAKE2B 619e9348d1f773328b613c3f7201b763b45da94fed98e882f0eacb910191e5088e9493add4223161a3eefbcfc7bee1af15438c507ba1f8a48df85ae5895ff620 SHA512 6c8351e0ff5905c7bdc48e8d3d0d316188a70cb1633fbecc5e867a127e23da7f947e70f6517847df04d2d231b70990040041f6b18546cbe5b441cc939e1addce
-EBUILD mattermost-desktop-bin-3.7.1.ebuild 1290 BLAKE2B 619e9348d1f773328b613c3f7201b763b45da94fed98e882f0eacb910191e5088e9493add4223161a3eefbcfc7bee1af15438c507ba1f8a48df85ae5895ff620 SHA512 6c8351e0ff5905c7bdc48e8d3d0d316188a70cb1633fbecc5e867a127e23da7f947e70f6517847df04d2d231b70990040041f6b18546cbe5b441cc939e1addce
-EBUILD mattermost-desktop-bin-4.0.0.ebuild 2522 BLAKE2B 5da4228ef6a948bf3e9befa2abd1ed9e6ee1cca0e75d8544c1d22adecbd550e7b9f096f145bf70493c1dd4535e68b0e3803673bb85a864fb914460909eda47b2 SHA512 bbb3cfdabacef8d66bc95b075e275a3a2a49040bd551ad1bfb5b5b950c67a53410a0a29aa7abe7d8495fd52bd0a4ffccda9dc050a8ffb71f3294709638cda5a1
+EBUILD mattermost-desktop-bin-4.0.0.ebuild 1881 BLAKE2B 12b6ad98c51c7bd6d4ff11f1d05303051272c65b3f4154d008693b770f135ba6579e52c8b8c2c77903e4a04bc6309fa27747437bb4b5591eaa71cb21209c0975 SHA512 e0eb06677bc24fb164ac122d2dae489940582101953f5fce6b48dd25c7421e54391a32d462551167042f8e09c2ecb66a4341f62ca006d2de40bb752d33d4d378
 MISC metadata.xml 562 BLAKE2B 8538ed0f2d27a849f8aa0817fc2fb6c107948d5b7328a06ac08007fee31fdba16efc700fa8cf5380e92b41a7b2ceddb882ccedb22556ef818516263bfbc5ee94 SHA512 1d546b4db1979bd9f9e0b8fdcf5708b497cb385d977f6f18e2416c30c68feb08b656711d2bfeb9db7376e3d069f33018ddc16211de49b286f073f694a757192f
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.5.0.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.5.0.ebuild
deleted file mode 100644
index e6c1915fe0d7..000000000000
--- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.5.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils
-
-MY_PN="${PN%-*}"
-
-DESCRIPTION="Mattermost Desktop application"
-HOMEPAGE="https://about.mattermost.com/"
-
-SRC_URI="
-https://github.com/mattermost/desktop/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	amd64? ( https://releases.mattermost.com/desktop/3.5.0/mattermost-desktop-${PV}-linux-x64.tar.gz )
-	x86?   ( https://releases.mattermost.com/desktop/3.5.0/mattermost-desktop-${PV}-linux-ia32.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/mattermost-desktop-${PV}"
-
-QA_PREBUILT="
-	opt/mattermost-desktop/mattermost-desktop
-	opt/mattermost-desktop/libnode.so
-	opt/mattermost-desktop/libffmpeg.so
-"
-
-src_install() {
-	insinto "/opt/${MY_PN}/locales"
-	doins locales/*.pak
-
-	insinto "/opt/${MY_PN}/resources"
-	doins resources/*.asar
-
-	insinto "/opt/${MY_PN}"
-	doins *.pak *.bin *.dat
-
-	exeinto "/opt/${MY_PN}"
-
-	doexe *.so "${MY_PN}"
-
-	dosym "/opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
-
-	newicon "${S}/icon.png" "${MY_PN}.png"
-	make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.6.0.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.6.0.ebuild
deleted file mode 100644
index 71d5332674bc..000000000000
--- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.6.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils
-
-MY_PN="${PN%-*}"
-
-DESCRIPTION="Mattermost Desktop application"
-HOMEPAGE="https://about.mattermost.com/"
-
-SRC_URI="
-https://github.com/mattermost/desktop/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
-	x86?   ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-ia32.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/mattermost-desktop-${PV}"
-
-QA_PREBUILT="
-	opt/mattermost-desktop/mattermost-desktop
-	opt/mattermost-desktop/libnode.so
-	opt/mattermost-desktop/libffmpeg.so
-"
-
-src_install() {
-	insinto "/opt/${MY_PN}/locales"
-	doins locales/*.pak
-
-	insinto "/opt/${MY_PN}/resources"
-	doins resources/*.asar
-
-	insinto "/opt/${MY_PN}"
-	doins *.pak *.bin *.dat
-
-	exeinto "/opt/${MY_PN}"
-
-	doexe *.so "${MY_PN}"
-
-	dosym "/opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
-
-	newicon "${S}/icon.png" "${MY_PN}.png"
-	make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.7.0.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.7.0.ebuild
deleted file mode 100644
index b7fb85c33a84..000000000000
--- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.7.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-MY_PN="${PN%-*}"
-
-DESCRIPTION="Mattermost Desktop application"
-HOMEPAGE="https://about.mattermost.com/"
-
-SRC_URI="
-	https://github.com/mattermost/desktop/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
-	x86?   ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-ia32.tar.gz )
-"
-
-LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="gnome-base/gconf:2"
-
-S="${WORKDIR}/mattermost-desktop-${PV}"
-
-QA_PREBUILT="
-	opt/mattermost-desktop/mattermost-desktop
-	opt/mattermost-desktop/libnode.so
-	opt/mattermost-desktop/libffmpeg.so
-"
-
-DOCS=(
-	NOTICE.txt
-	LICENSES.chromium.html
-	LICENSE.txt
-	LICENSE.electron.txt
-	README.md
-)
-
-src_install() {
-	insinto "/opt/${MY_PN}/locales"
-	doins locales/*.pak
-
-	insinto "/opt/${MY_PN}/resources"
-	doins resources/*.asar
-
-	insinto "/opt/${MY_PN}"
-	doins *.pak *.bin *.dat
-	exeinto "/opt/${MY_PN}"
-	doexe *.so "${MY_PN}"
-
-	dosym "/opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
-
-	newicon "${S}/icon.png" "${MY_PN}.png"
-	make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}"
-
-	einstalldocs
-}
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.7.1.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.7.1.ebuild
deleted file mode 100644
index b7fb85c33a84..000000000000
--- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.7.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-MY_PN="${PN%-*}"
-
-DESCRIPTION="Mattermost Desktop application"
-HOMEPAGE="https://about.mattermost.com/"
-
-SRC_URI="
-	https://github.com/mattermost/desktop/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
-	x86?   ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-ia32.tar.gz )
-"
-
-LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="gnome-base/gconf:2"
-
-S="${WORKDIR}/mattermost-desktop-${PV}"
-
-QA_PREBUILT="
-	opt/mattermost-desktop/mattermost-desktop
-	opt/mattermost-desktop/libnode.so
-	opt/mattermost-desktop/libffmpeg.so
-"
-
-DOCS=(
-	NOTICE.txt
-	LICENSES.chromium.html
-	LICENSE.txt
-	LICENSE.electron.txt
-	README.md
-)
-
-src_install() {
-	insinto "/opt/${MY_PN}/locales"
-	doins locales/*.pak
-
-	insinto "/opt/${MY_PN}/resources"
-	doins resources/*.asar
-
-	insinto "/opt/${MY_PN}"
-	doins *.pak *.bin *.dat
-	exeinto "/opt/${MY_PN}"
-	doexe *.so "${MY_PN}"
-
-	dosym "/opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
-
-	newicon "${S}/icon.png" "${MY_PN}.png"
-	make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}"
-
-	einstalldocs
-}
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.0.0.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.0.0.ebuild
index 5218794a1b69..3d6654abfa82 100644
--- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.0.0.ebuild
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.0.0.ebuild
@@ -4,9 +4,8 @@
 EAPI=6
 
 MY_PN="${PN%-*}"
-MULTILIB_COMPAT=( abi_x86_64 )
 
-inherit eutils multilib-build
+inherit eutils
 
 DESCRIPTION="Mattermost Desktop application"
 HOMEPAGE="https://about.mattermost.com/"
@@ -19,39 +18,39 @@ SRC_URI="
 
 LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	gnome-base/gconf:2[${MULTILIB_USEDEP}]
-	dev-libs/atk:0[${MULTILIB_USEDEP}]
-	dev-libs/expat:0[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr:0[${MULTILIB_USEDEP}]
-	dev-libs/nss:0[${MULTILIB_USEDEP}]
-	gnome-base/gconf:2[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
-	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	net-print/cups:0[${MULTILIB_USEDEP}]
-	sys-apps/dbus:0[${MULTILIB_USEDEP}]
-	sys-devel/gcc[${MULTILIB_USEDEP}]
-	sys-libs/glibc:2.2[${MULTILIB_USEDEP}]
-	x11-libs/cairo:0[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-	x11-libs/libX11:0[${MULTILIB_USEDEP}]
-	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
-	x11-libs/libXext:0[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
-	x11-libs/libXi:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrender:0[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
-	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
-	x11-libs/pango:0[${MULTILIB_USEDEP}]"
+	gnome-base/gconf:2
+	dev-libs/atk:0
+	dev-libs/expat:0
+	dev-libs/glib:2
+	dev-libs/nspr:0
+	dev-libs/nss:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib:0
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	net-print/cups:0
+	sys-apps/dbus:0
+	sys-devel/gcc
+	sys-libs/glibc:2.2
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libX11:0
+	x11-libs/libxcb:0/1.12
+	x11-libs/libXcomposite:0
+	x11-libs/libXcursor:0
+	x11-libs/libXdamage:0
+	x11-libs/libXext:0
+	x11-libs/libXfixes:0
+	x11-libs/libXi:0
+	x11-libs/libXrandr:0
+	x11-libs/libXrender:0
+	x11-libs/libXScrnSaver:0
+	x11-libs/libXtst:0
+	x11-libs/pango:0"
 
 S="${WORKDIR}/mattermost-desktop-${PV}"
 
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 05e39eef181e..888c38388961 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.14.1_amd64.deb 65711118 BLAKE2B 17baf6e83c54a504784d9fc1bdcf5ec1b2ae9148b4d833a77d5f916c84cd3affcc4f77f205284b86aaaa2a253e0a8480742270c4f21ab566d7213c7422f68157 SHA512 3180c44e4131a2e13d75896e728f4ee4f20064902536fdeafa4ccfb47a29a131826622341ada4ba1d3e71db8a8a141fdeb7f66b586c8993ba1ed78daaa23d2df
-EBUILD signal-desktop-bin-1.14.1.ebuild 1204 BLAKE2B 14c337f5c12ddcf3197c7bfc3a902b4e930bf87bb868f276bb2a37245ad9e23de59effbf56ac3c98631598c3ac20b7691ec48d8abcd6a2569236f7954de9572e SHA512 59455890ec3c64060964b4b430047d6e1273794083d8fce5a41c2efc1a30b47fb7d99f60935f2664a9a57c1e9adf62fae74dec52ada893bf3558bf79458db261
+DIST signal-desktop_1.14.4_amd64.deb 65716964 BLAKE2B 6209261ea15e14ae6b8da175afdddc4f48af55094a4dab20bdf7dcb5fe52ae79fbb7e2c235297afca2506749de387f8ca06b36a4aa89232b4cf903ded92c291e SHA512 d5e35fe04bbcb64cd2b5d12823be5400a85ca5ec8c24891f7f12aa6c38074f97a739afe7f028b4a397d1cc4d2e7193d7354829b54847dd0e95c71c7a46dae017
+EBUILD signal-desktop-bin-1.14.4.ebuild 1204 BLAKE2B 14c337f5c12ddcf3197c7bfc3a902b4e930bf87bb868f276bb2a37245ad9e23de59effbf56ac3c98631598c3ac20b7691ec48d8abcd6a2569236f7954de9572e SHA512 59455890ec3c64060964b4b430047d6e1273794083d8fce5a41c2efc1a30b47fb7d99f60935f2664a9a57c1e9adf62fae74dec52ada893bf3558bf79458db261
 MISC metadata.xml 510 BLAKE2B 618fc8fb3b176d175bb15ceef941c60ebd89666f4b01f7b7912a4c26d8f54802982a8c089480f11573418daf88fb559dacca797c7f42493d122fd448c53eb923 SHA512 9d9ae0f5f1961fc1ad9b0e59f8d2003fc746f6f25dabb6c35b6ee8e151caf25e724b321e0c11a1b02f5431a204215caf5a4614232508b8492a0d33cd4bb46b8a
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.14.1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.14.4.ebuild
index 4c7b60f0d173..4c7b60f0d173 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.14.1.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.14.4.ebuild