gentoo resync : 16.02.1018

20 files changed, 198 insertions, 548 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index fac6907bb1ab..01aff2bd3da0 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/gitter-bin/Manifest b/net-im/gitter-bin/Manifest
index 28b08387d065..80539a530804 100644
--- a/net-im/gitter-bin/Manifest
+++ b/net-im/gitter-bin/Manifest
@@ -1,4 +1,7 @@
 DIST gitter_3.1.0_amd64.deb 43340316 BLAKE2B 18682a8f467159fc3a0f765505a53982ba3bf0c7992782e256388076f6fba82e4e895d915376f9dfd333af57288d66f93e58bc9e48ecbfb1a5d11f060ac2df41 SHA512 b2888a2c9ed399102e2e80a2ec1ffafe093bdbe2f11d74753052c14841201cf586e0bb2a42ff8e67517d000a7c0b6f6aed30c32b3a7ecc683a18f8433b0bfa1c
 DIST gitter_3.1.0_i386.deb 45251440 BLAKE2B 01ea8b670e95496b7b4015ad6a31f546cf00a615dc562255b5761e797fd65ac00c5a89dd6353522359cbb5abf299aed50e3461fd1d2364e7667f4f748a288137 SHA512 4e58f5ca1a5db9139bef29eff2ffd7d599268844c11be65f98e9a78ad7a602c5d115e633c02519d025fe3d81f3174c478d5590bb2beaa92697617dc11fc141f6
+DIST gitter_4.1.0_amd64.deb 98314502 BLAKE2B 3f14e044865c9af89dc6ac62dbe8f8221824c6f529418a31fd5236ecec45ddfd6013d734100a414a2bbca0db9e8c40cb7046868391d507ba5c9de9da0c66225d SHA512 2ea0ebbc05cbdc40e4e8cb07a68b3948477a61a81e550b8f131af46315c6fc7547c0954aa101260f93b63c557f3e00b1e23006a236b77be01ea4a82edd170f70
+DIST gitter_4.1.0_i386.deb 101820112 BLAKE2B 3d1ab270389da9c82440dc7a204d1973402de1648e0387a026601d34bd1f2b26469b0fab9be4ff4b596cbe257047e88446b5c36d08deeeae1aaea4f387c45ac3 SHA512 c76da19e6eaf79894319848b6121660dab0bd8f2d8cdfaf413a68bee0f4c62fdca25c19c24eeb226164b643582db9ed686c68a5f72701618d41b423df9c9cee8
 EBUILD gitter-bin-3.1.0.ebuild 1988 BLAKE2B 1c26dba4f19137731281fe77aeae1ce2a76c37eea3ca6a9aaaa448b5c4093492fdfda61bea91267d5a478e2cfbd5b7f0ba78ff82ecded46aed3c8580c5697bfd SHA512 516f0d52ed13b7a66f1242e5c843019ff13e2bd5e00cf04a74d19da5d81f2a9a2fba90c195f34d85e5b002d19ea421912ce60504832c2a4827b6b34e7418264e
-MISC metadata.xml 626 BLAKE2B b50b6161a9e83a6ada4548c23a898b069ffc09c8818e9abb4040e6df0cb436e586074a9225b1160df55b8358dd9b28422e2c774ab3ddc3dc7fae2ce930a3a4e8 SHA512 5cf4563c5dc36d509ae10a1824bebbd1f559bb57ff642e0f11f55676c894e2fae49060f7e4c1fb5fec9c1bed4814eacb1ecab2bca31eca5de72cb670840e08eb
+EBUILD gitter-bin-4.1.0.ebuild 2981 BLAKE2B aaefc6bb75db49afe0ac427f6a6a9ba6e5d2ea5b39b9e414bb07e5b07446ca67872d61776f25169bf0a3a0b0da128d6192358595cd55ab622f597ef06240dc93 SHA512 166da8759debf400970fb563730aa609505ec9fccd9360b222e5b6fb9188efffeb84626668fcaf8a59d186873c97587f2d93120980cb423130543fc84bb043c3
+MISC metadata.xml 710 BLAKE2B 3807b9843d68e224ccdae9ae618672f42243064cdef8aa4c7cd66eb5dd4e99575cb05ac8ee700b754e5eff28864e9641284363be4f92ba4a420f3dfc0740abd9 SHA512 b3b02d786643953704e204546384c0c48062eddae58c5314d8aa460e846753a6df796fece8f66abbf538f755fa767f021654346772a07a5cabbdd342991d892c
diff --git a/net-im/gitter-bin/gitter-bin-4.1.0.ebuild b/net-im/gitter-bin/gitter-bin-4.1.0.ebuild
new file mode 100644
index 000000000000..b0d7e485b685
--- /dev/null
+++ b/net-im/gitter-bin/gitter-bin-4.1.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+MY_PN="${PN/-bin/}"
+
+inherit desktop gnome2-utils multilib-build pax-utils unpacker
+
+QA_PREBUILT="opt/gitter/pnacl/pnacl_public_x86_64_libcrt_platform_a
+	opt/gitter/pnacl/pnacl_public_x86_64_pnacl_llc_nexe
+	opt/gitter/pnacl/pnacl_public_x86_64_ld_nexe
+	opt/gitter/pnacl/pnacl_public_x86_64_pnacl_sz_nexe
+	opt/gitter/payload
+	opt/gitter/swiftshader/libEGL.so
+	opt/gitter/swiftshader/libGLESv2.so
+	opt/gitter/chromedriver
+	opt/gitter/lib/libnw.so
+	opt/gitter/lib/libnode.so
+	opt/gitter/lib/libffmpeg.so
+	opt/gitter/nacl_helper
+	opt/gitter/nwjc
+	opt/gitter/nacl_irt_x86_64.nexe
+	opt/gitter/Gitter"
+
+DESCRIPTION="Chat and network platform"
+HOMEPAGE="http://www.gitter.im/"
+SRC_URI="
+	amd64? ( https://update.gitter.im/linux64/${MY_PN}_${PV}_amd64.deb )
+	x86? ( https://update.gitter.im/linux32/${MY_PN}_${PV}_i386.deb )"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="pax_kernel"
+RESTRICT="bindist mirror"
+
+RDEPEND="dev-libs/atk:0[${MULTILIB_USEDEP}]
+	dev-libs/expat:0[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr:0[${MULTILIB_USEDEP}]
+	dev-libs/nss:0[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
+	sys-apps/dbus:0[${MULTILIB_USEDEP}]
+	x11-libs/cairo:0[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:3[${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/libXtst:0[${MULTILIB_USEDEP}]
+	x11-libs/pango:0[${MULTILIB_USEDEP}]"
+DEPEND="sys-apps/fix-gnustack"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	local arch
+	arch="$(usex amd64 "64" "32")"
+
+	# Modify desktop file to use common paths
+	sed -i \
+		-e '/Exec/s/=.*/=\/usr\/bin\/gitter/' \
+		-e '/Icon/s/=.*/=\/usr\/share\/pixmaps\/gitter.png/' \
+		opt/Gitter/linux"${arch}"/gitter.desktop || die "sed failed"
+}
+
+src_install() {
+	local arch
+	arch="$(usex amd64 "64" "32")"
+
+	fix-gnustack -f opt/Gitter/linux"${arch}"/nacl_irt_x86_64.nexe > /dev/null \
+		|| die "removing execstack flag failed"
+
+	newicon opt/Gitter/linux"${arch}"/logo.png gitter.png
+	newicon -s 256 opt/Gitter/linux"${arch}"/logo.png gitter.png
+	domenu opt/Gitter/linux"${arch}"/gitter.desktop
+
+	insinto /opt/gitter
+	doins -r opt/Gitter/linux"${arch}"/.
+	fperms +x /opt/gitter/Gitter
+	dosym ../../opt/gitter/Gitter /usr/bin/gitter
+
+	use pax_kernel && pax-mark -m "${ED%/}"/opt/gitter/Gitter
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-im/gitter-bin/metadata.xml b/net-im/gitter-bin/metadata.xml
index 2aa6d30c64dc..88b44ca0dc0c 100644
--- a/net-im/gitter-bin/metadata.xml
+++ b/net-im/gitter-bin/metadata.xml
@@ -14,6 +14,9 @@
 	grow and connect communities through messaging, content
 	and discovery.
 	</longdescription>
+	<use>
+		<flag name="pax_kernel">Triggers a paxmarking of the binary</flag>
+	</use>
 	<upstream>
 		<doc>https://gitter.zendesk.com/hc/en-us</doc>
 	</upstream>
diff --git a/net-im/librvp/Manifest b/net-im/librvp/Manifest
index b02188f1cb67..5f4c5347be2b 100644
--- a/net-im/librvp/Manifest
+++ b/net-im/librvp/Manifest
@@ -1,5 +1,5 @@
 DIST librvp-0.9.6.tar.gz 464935 BLAKE2B 4698484eb8bef18a67c16618c2083968ab765da0b73c85e71e3aee7f08a52acb9d69f680743cabf1e9300b5aa13d79ef1eeedc3b38db9ef85b09cd114708017b SHA512 5ec9aafbfc937b3bac648632e879393b826bd8206d7c16f921705855f0f6e7aadc18b8e119aa8b356e3095d1a0ff798a8d576386dd097b7f7794f577c8190c46
 DIST librvp-0.9.7.tar.gz 478014 BLAKE2B 5e57bb7899037084f7e1f9a1f5816f199efb200a62b3e56e400ac5850fc2cb9fcffc9248c61b4ccbc73a67cf628ae06af36d443047ffc67f351c795320f58132 SHA512 dd097f3b845288771be33b553cfc0da90a87350e2021f9fe706e6b7479abc3bb1c7d08a9f38f9376fee235a5491c30bb65e7bd968901626ddf0499aa5ca1580c
 EBUILD librvp-0.9.6.ebuild 608 BLAKE2B c7b5a23ed61c3cc20370396fc462387efdd2dee8f2eeb7d5692a703b2f9d59fed3132e042efea3eba38da97591cff855b8fcee5320791603d622951cbbf036a4 SHA512 c6ce8b89c4cc66d635673592c2d2717a3aae2ec3eada54bdb8bfebafc23b5c4b3b465b26a4909215e68a045361cbace9f4db36e07b1ec1046172d023beb6fbda
-EBUILD librvp-0.9.7.ebuild 610 BLAKE2B d3d1b082200c53d19e894751555c8135cfa9a62b462d6bb900be75c64270da2265bbe4cf06004bc89f293e8f30833eea272ab8fd110354712f6c28c4f1b43342 SHA512 2f1bcbeff55d8ce61c3a7c1fc2273e2181412b063c8f2800b81f2502a866c09bc84ed9b61957da4d54efa86329c20991e633c67978d0f9850f102bdf49716ac0
+EBUILD librvp-0.9.7.ebuild 606 BLAKE2B ee6c7df2f41ffd68efc0fe1e98e54b2bfb2e256f39e45fe13ba1075a3f701d081507862c33032953ea8a5a276f1ce8ba280e1e1988a72adc4b5374e2f140f8d3 SHA512 5fc9a3348680fa98d8d89ac1d4b9ebc3f699b60945e1101a27038020bb5cd6d9d8f0650e0982bcb40e3017030bd7fef5a3959d9ee85827461419974302f95882
 MISC metadata.xml 404 BLAKE2B 64a654e99fa075b23bb464da322da0cf55383264f5fa5322784a1db4c22924db63b127c901b26047e5e6af7902115e3c6a262b381e4b3c7d15723b8a6e381b7e SHA512 c8a45182953464dc9ebc337a7757f44acf247343d9ea58ace3bf356723402de0134020a44f00acd9016c8fc1ac89f239c124ad381abc497fae110c051b69792f
diff --git a/net-im/librvp/librvp-0.9.7.ebuild b/net-im/librvp/librvp-0.9.7.ebuild
index 8099329ca4ad..80b28a8e905b 100644
--- a/net-im/librvp/librvp-0.9.7.ebuild
+++ b/net-im/librvp/librvp-0.9.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.waider.ie/hacks/workshop/c/rvp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="net-im/pidgin[gtk]"
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
index ef2e2ac4cf97..2ea17af7fe6a 100644
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@@ -1,15 +1,6 @@
 AUX openfire-confd 491 BLAKE2B 72f9d628dbff91070da20187d1c589780f48c5301a067d59ee0c3272dfc207f0f0498db0efdbdb661a7e338184c0ffecca9eb6f8682f44f9cf390ee3dda51ca3 SHA512 c35e00f7e6b4136c1e8ab71b9221a91f3821a536be54681567cd5948243b9b1575056324c104cf038df8191777361b5eed8a1917185aead431a8f5343f1ed698
 AUX openfire-initd 632 BLAKE2B ad62275986dde956d4eef79636210230e0d006d837b16034a51ba97268ffd0af6123f92431e2b54e3e4832c994b54599237eb1612feba4e33d97e81d800364ec SHA512 29dfb750e0d177b2983889d81374f997df95991d773d497c2b8a212281f0763b950f9415dcb82928a60e8c4e90e5f87719f527ec723e04d2b2bdc2b0ce8ad6d2
 AUX openfire.service 364 BLAKE2B b126df83a6277c38aa370b515e99cc2239649f18c5fb46e20c8d69d256d33b236b96fced46bcb798873da554b7c7672ab1f398f1767b6d10864c1d7a52b6907d SHA512 3dbf25d1566b1d1bdbd9f67deb30456451ffe2fa9d247c66e2bc45b3dc6a0fd91c0fc47d6e4ba5001217225f0a2bd6c2b60eb3056003cc580a10f0560a1fe231
-DIST openfire_src_4_1_0.tar.gz 103449811 BLAKE2B 4635da8c1c59f66b488951aa8844a4517e7a2a644dbb97f88ff508237127d8852bbaacd9eae7bc608839ccbe9a679a11da3d5539642d478c15b9edcb7b10e90c SHA512 3a4e26c260f6a91ece6e6d3fc7c3302b6f1735725ce2686bab8773981dad63ef653a25748852c32e4df8f6bde2882db4043d94b69eb774a5280285fd5b7cd96b
-DIST openfire_src_4_1_4.tar.gz 103457596 BLAKE2B d69719ba84aa2ca7bebe03f151940f74488c1c191e8286a8d985b54b66078cd311d2ac50a61597214b3b99b34dc1b854f8f6c43002733897cf806292e92a13af SHA512 e9b7bb62656b376ffc52db5403c262d5a986698282ac9eec02d3a893076cc6df3f4666e908672a9d65cb313505fcc377fb3d7bb62f30d665aa8523cab7d714bd
-DIST openfire_src_4_1_5.tar.gz 103508870 BLAKE2B cedc72fa311f3d97376588c661ac7ecb771ae616f1c9afa816fcb1434100e013b5407442cf46bd0aba68d9bd502e423a4bcfaa6f1da029a1639f14eea59575aa SHA512 9ccdd2916492ab23a71856ded8024f6dea73491810ee80c8284597eaf8d2fd55ccc47c7d1da704a487aba727761fdc50f0f6baa26349673fe74dabf0f2b36e73
-DIST openfire_src_4_2_2.tar.gz 110865419 BLAKE2B 5bfa5effcadaa770cc664923602eed9e898ae9d1118b0c460f6c4283f2e29f381707f924729391744cb4bf545a3703be9ede5a75acc91a5ebb4644b31d00ed12 SHA512 b19f028ae64ad26df24979e6863c4ed598ddbb84e048b8d291026726528a65fc4f53aaa42a6b8478f583326d9ce8e0bc0d0801a0a0696df6448bd79cce4e015e
 DIST openfire_src_4_2_3.tar.gz 113557155 BLAKE2B f01bfb57ee76be4dfea11d450534f66f1b50450095cf2d752f910352057ab421f72603b8a79f809f1e9aef20004bb90e9514e68dccb95de709083de9410e4a57 SHA512 8b968c94fcd779544c90de34172b00d472dc2e42142f2aa5eda01f0e0c3dda903a3b9b6d82286916bb1ae8f97fb12f0a94aeb42fad1df0b2dd47e951e03b8523
-EBUILD openfire-4.1.0.ebuild 2875 BLAKE2B 6cb7b4da9c43e66bc2520ccbb9c520af2b70715c06dbff52419dcd96fcb82729d3a4497b0c212c8b0fa8b2cba35a5d2f71ee47996176625b1ae7f706f5c00c76 SHA512 b5e1a11513de5a1afcfb51a46f024d83a3819230d254a17e32f66f17f96e2a4ee41ce2ddea4b79b2b699e7f3671f3ba816153cec64118d0961119b312324c917
-EBUILD openfire-4.1.4.ebuild 2877 BLAKE2B ff6480b34681afe96e3c69dd099dda70b19635a6a1298a998d0895898663fdcfb630417198d5014eaa72144dc0996dd8d0f927bf8d49e3ce5e34ca6fc17a95de SHA512 fbf36088c9e99e7b86a1a1e37a7a0f4213a370407ddd94f230af373e8e33126e68ad72532ecaa17560586ab479609c2db911506b7fdf4e947041bccd30047583
-EBUILD openfire-4.1.5.ebuild 2877 BLAKE2B ff6480b34681afe96e3c69dd099dda70b19635a6a1298a998d0895898663fdcfb630417198d5014eaa72144dc0996dd8d0f927bf8d49e3ce5e34ca6fc17a95de SHA512 fbf36088c9e99e7b86a1a1e37a7a0f4213a370407ddd94f230af373e8e33126e68ad72532ecaa17560586ab479609c2db911506b7fdf4e947041bccd30047583
-EBUILD openfire-4.2.2.ebuild 2877 BLAKE2B 19b2278da0c1a57499b62c6a329c7c1d01563e73842be2012fa8aab5880daaa8c68e6133dcc707b73375966a4e064577266c14ac6593b24961463e474d9a552c SHA512 1a38c942abd5aeb3fcb011ed21a2383d14ccffa9be6d8a834ac33d9952088e7f06bb194d0c0888897f8d4cc30255fd03ba588070f1543ac6dc7257a4639c23aa
-EBUILD openfire-4.2.3-r1.ebuild 2345 BLAKE2B bc79ff8ab445e0f5d956bab9d99a289c410928c45b61e3bf6e438f1bc338fc1014866b9e434d2db10d1c3c3e3860816389f86715bf7fbb433d4e0d2e63506e4b SHA512 2748a0b5702f9689af20770f17a9c5498d976c76de1f833487e2d22b4ef47f16137d128777f22406c40398bf8abb2181556f8736fdd5402b04e4a8e0af0a0d22
-EBUILD openfire-4.2.3.ebuild 2349 BLAKE2B 8097d183be7508fee0086a78644c238b87698f1b3ca3902e5b7caf4102103a98bdeee80d33fc367d1c4faebf38e5e35da6a486543884e143d2481a2fe22458ac SHA512 dbd52c2f47add0453c487085e008836aaf37b36e7d20350ca9cc70dd22874880087b30111dc741e09dac0463d3d55c4fcecb143e6127b571d0041de291a8c694
+EBUILD openfire-4.2.3-r1.ebuild 2340 BLAKE2B 012bb3a3c52140c5becc0249a1b190be858bf5e12e957fdc398a68905ec92c49f1f88ecd9bfcdcd865411c393b27442397b285688a4e4b5802be1b649a939364 SHA512 d29470b0dbf2aa489066d443649e155b4eed02275be02a698c3c8e35e742ac00714bde72183a8bb7045fb6e099455e0ec84114d15f0b4327c5f8486dc94d8206
 MISC metadata.xml 378 BLAKE2B f1e9fa34726dda5df1dae58a629ec60b1528ffd8327f0060542fbdf05207e6ec86ef03572cf1fe3f49c0bb5d96ab071ffa980fb20ef0453a338bb67022eff02c SHA512 6669bcb3e4975eb6e3d9bc45e80d68e1101cf6a7e827a5cc6a4e9c0fe5f1c3ffe1a53382706c9093099294b9153556ef6e5418b25cc7131a057ec96f259eca25
diff --git a/net-im/openfire/openfire-4.1.0.ebuild b/net-im/openfire/openfire-4.1.0.ebuild
deleted file mode 100644
index 380dd1027786..000000000000
--- a/net-im/openfire/openfire-4.1.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2 java-ant-2 systemd
-
-MY_P=${PN}_src_${PV//./_}
-DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
-HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
-SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND=">=virtual/jre-1.7"
-DEPEND="net-im/jabber-base
-	~dev-java/ant-contrib-1.0_beta2
-	>=virtual/jdk-1.7"
-
-S=${WORKDIR}/${PN}_src
-
-pkg_setup() {
-	if [[ -f /etc/env.d/98openfire ]]; then
-		einfo "This is an upgrade"
-		ewarn "As the plugin API changed, at least these plugins need to be updated also:"
-		ewarn "User Search, IM Gateway, Fastpath, Monitoring"
-		ewarn "they can be downloaded via Admin Console or at"
-		ewarn "    ${HOMEPAGE}"
-	else
-		ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
-		ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire "
-		ewarn "For more info see bug #139708"
-		sleep 11
-	fi
-	java-pkg-2_pkg_setup
-}
-
-src_compile() {
-	# Jikes doesn't support -source 1.5
-	java-pkg_filter-compiler jikes
-
-	ANT_TASKS="ant-contrib"
-	eant -f build/build.xml openfire plugins $(use_doc)
-
-	# delete nativeAuth prebuilt libs:
-	#    uses outdated unmaintained libshaj, does not support amd64
-	rm -rfv target/openfire/resources/nativeAuth || die
-}
-
-src_install() {
-	dodir /opt/openfire
-
-	newinitd "${FILESDIR}"/openfire-initd openfire
-	newconfd "${FILESDIR}"/openfire-confd openfire
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	dodir /opt/openfire/conf
-	insinto /opt/openfire/conf
-	newins target/openfire/conf/openfire.xml openfire.xml.sample
-	newins target/openfire/conf/security.xml security.xml.sample
-
-	dodir /opt/openfire/logs
-	keepdir /opt/openfire/logs
-
-	dodir /opt/openfire/lib
-	insinto /opt/openfire/lib
-	doins target/openfire/lib/*
-
-	dodir /opt/openfire/plugins
-	insinto /opt/openfire/plugins
-	doins -r target/openfire/plugins/*
-
-	dodir /opt/openfire/resources
-	insinto /opt/openfire/resources
-	doins -r target/openfire/resources/*
-
-	if use doc; then
-		dohtml -r documentation/docs/*
-	fi
-	dodoc documentation/dist/*
-
-	#Protect ssl key on upgrade
-	dodir /etc/env.d/
-	echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire
-}
-
-pkg_postinst() {
-	local src
-	local dst
-
-	# http://community.igniterealtime.org/thread/52289
-	for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
-	do
-		src="${dst}".sample
-		if [[ -f "${dst}" ]]; then
-			einfo "Leaving old '${dst}'"
-		else
-			einfo "Created default '${dst}'. Please edit."
-			cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
-			chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
-		fi
-	done
-	chown -R jabber:jabber "${ROOT}"/opt/openfire
-}
diff --git a/net-im/openfire/openfire-4.1.4.ebuild b/net-im/openfire/openfire-4.1.4.ebuild
deleted file mode 100644
index e6feaf1a438d..000000000000
--- a/net-im/openfire/openfire-4.1.4.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2 java-ant-2 systemd
-
-MY_P=${PN}_src_${PV//./_}
-DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
-HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
-SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=virtual/jre-1.7"
-DEPEND="net-im/jabber-base
-	~dev-java/ant-contrib-1.0_beta2
-	>=virtual/jdk-1.7"
-
-S=${WORKDIR}/${PN}_src
-
-pkg_setup() {
-	if [[ -f /etc/env.d/98openfire ]]; then
-		einfo "This is an upgrade"
-		ewarn "As the plugin API changed, at least these plugins need to be updated also:"
-		ewarn "User Search, IM Gateway, Fastpath, Monitoring"
-		ewarn "they can be downloaded via Admin Console or at"
-		ewarn "    ${HOMEPAGE}"
-	else
-		ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
-		ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire "
-		ewarn "For more info see bug #139708"
-		sleep 11
-	fi
-	java-pkg-2_pkg_setup
-}
-
-src_compile() {
-	# Jikes doesn't support -source 1.5
-	java-pkg_filter-compiler jikes
-
-	ANT_TASKS="ant-contrib"
-	eant -f build/build.xml openfire plugins $(use_doc)
-
-	# delete nativeAuth prebuilt libs:
-	#    uses outdated unmaintained libshaj, does not support amd64
-	rm -rfv target/openfire/resources/nativeAuth || die
-}
-
-src_install() {
-	dodir /opt/openfire
-
-	newinitd "${FILESDIR}"/openfire-initd openfire
-	newconfd "${FILESDIR}"/openfire-confd openfire
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	dodir /opt/openfire/conf
-	insinto /opt/openfire/conf
-	newins target/openfire/conf/openfire.xml openfire.xml.sample
-	newins target/openfire/conf/security.xml security.xml.sample
-
-	dodir /opt/openfire/logs
-	keepdir /opt/openfire/logs
-
-	dodir /opt/openfire/lib
-	insinto /opt/openfire/lib
-	doins target/openfire/lib/*
-
-	dodir /opt/openfire/plugins
-	insinto /opt/openfire/plugins
-	doins -r target/openfire/plugins/*
-
-	dodir /opt/openfire/resources
-	insinto /opt/openfire/resources
-	doins -r target/openfire/resources/*
-
-	if use doc; then
-		dohtml -r documentation/docs/*
-	fi
-	dodoc documentation/dist/*
-
-	#Protect ssl key on upgrade
-	dodir /etc/env.d/
-	echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire
-}
-
-pkg_postinst() {
-	local src
-	local dst
-
-	# http://community.igniterealtime.org/thread/52289
-	for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
-	do
-		src="${dst}".sample
-		if [[ -f "${dst}" ]]; then
-			einfo "Leaving old '${dst}'"
-		else
-			einfo "Created default '${dst}'. Please edit."
-			cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
-			chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
-		fi
-	done
-	chown -R jabber:jabber "${ROOT}"/opt/openfire
-}
diff --git a/net-im/openfire/openfire-4.1.5.ebuild b/net-im/openfire/openfire-4.1.5.ebuild
deleted file mode 100644
index e6feaf1a438d..000000000000
--- a/net-im/openfire/openfire-4.1.5.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2 java-ant-2 systemd
-
-MY_P=${PN}_src_${PV//./_}
-DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
-HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
-SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=virtual/jre-1.7"
-DEPEND="net-im/jabber-base
-	~dev-java/ant-contrib-1.0_beta2
-	>=virtual/jdk-1.7"
-
-S=${WORKDIR}/${PN}_src
-
-pkg_setup() {
-	if [[ -f /etc/env.d/98openfire ]]; then
-		einfo "This is an upgrade"
-		ewarn "As the plugin API changed, at least these plugins need to be updated also:"
-		ewarn "User Search, IM Gateway, Fastpath, Monitoring"
-		ewarn "they can be downloaded via Admin Console or at"
-		ewarn "    ${HOMEPAGE}"
-	else
-		ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
-		ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire "
-		ewarn "For more info see bug #139708"
-		sleep 11
-	fi
-	java-pkg-2_pkg_setup
-}
-
-src_compile() {
-	# Jikes doesn't support -source 1.5
-	java-pkg_filter-compiler jikes
-
-	ANT_TASKS="ant-contrib"
-	eant -f build/build.xml openfire plugins $(use_doc)
-
-	# delete nativeAuth prebuilt libs:
-	#    uses outdated unmaintained libshaj, does not support amd64
-	rm -rfv target/openfire/resources/nativeAuth || die
-}
-
-src_install() {
-	dodir /opt/openfire
-
-	newinitd "${FILESDIR}"/openfire-initd openfire
-	newconfd "${FILESDIR}"/openfire-confd openfire
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	dodir /opt/openfire/conf
-	insinto /opt/openfire/conf
-	newins target/openfire/conf/openfire.xml openfire.xml.sample
-	newins target/openfire/conf/security.xml security.xml.sample
-
-	dodir /opt/openfire/logs
-	keepdir /opt/openfire/logs
-
-	dodir /opt/openfire/lib
-	insinto /opt/openfire/lib
-	doins target/openfire/lib/*
-
-	dodir /opt/openfire/plugins
-	insinto /opt/openfire/plugins
-	doins -r target/openfire/plugins/*
-
-	dodir /opt/openfire/resources
-	insinto /opt/openfire/resources
-	doins -r target/openfire/resources/*
-
-	if use doc; then
-		dohtml -r documentation/docs/*
-	fi
-	dodoc documentation/dist/*
-
-	#Protect ssl key on upgrade
-	dodir /etc/env.d/
-	echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire
-}
-
-pkg_postinst() {
-	local src
-	local dst
-
-	# http://community.igniterealtime.org/thread/52289
-	for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
-	do
-		src="${dst}".sample
-		if [[ -f "${dst}" ]]; then
-			einfo "Leaving old '${dst}'"
-		else
-			einfo "Created default '${dst}'. Please edit."
-			cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
-			chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
-		fi
-	done
-	chown -R jabber:jabber "${ROOT}"/opt/openfire
-}
diff --git a/net-im/openfire/openfire-4.2.2.ebuild b/net-im/openfire/openfire-4.2.2.ebuild
deleted file mode 100644
index ec3184294664..000000000000
--- a/net-im/openfire/openfire-4.2.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2 java-ant-2 systemd
-
-MY_P=${PN}_src_${PV//./_}
-DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
-HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
-SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=virtual/jre-1.7"
-DEPEND="net-im/jabber-base
-	~dev-java/ant-contrib-1.0_beta2
-	>=virtual/jdk-1.7"
-
-S=${WORKDIR}/${PN}_src
-
-pkg_setup() {
-	if [[ -f /etc/env.d/98openfire ]]; then
-		einfo "This is an upgrade"
-		ewarn "As the plugin API changed, at least these plugins need to be updated also:"
-		ewarn "User Search, IM Gateway, Fastpath, Monitoring"
-		ewarn "they can be downloaded via Admin Console or at"
-		ewarn "    ${HOMEPAGE}"
-	else
-		ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
-		ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire "
-		ewarn "For more info see bug #139708"
-		sleep 11
-	fi
-	java-pkg-2_pkg_setup
-}
-
-src_compile() {
-	# Jikes doesn't support -source 1.5
-	java-pkg_filter-compiler jikes
-
-	ANT_TASKS="ant-contrib"
-	eant -f build/build.xml openfire plugins $(use_doc)
-
-	# delete nativeAuth prebuilt libs:
-	#    uses outdated unmaintained libshaj, does not support amd64
-	rm -rfv target/openfire/resources/nativeAuth || die
-}
-
-src_install() {
-	dodir /opt/openfire
-
-	newinitd "${FILESDIR}"/openfire-initd openfire
-	newconfd "${FILESDIR}"/openfire-confd openfire
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	dodir /opt/openfire/conf
-	insinto /opt/openfire/conf
-	newins target/openfire/conf/openfire.xml openfire.xml.sample
-	newins target/openfire/conf/security.xml security.xml.sample
-
-	dodir /opt/openfire/logs
-	keepdir /opt/openfire/logs
-
-	dodir /opt/openfire/lib
-	insinto /opt/openfire/lib
-	doins target/openfire/lib/*
-
-	dodir /opt/openfire/plugins
-	insinto /opt/openfire/plugins
-	doins -r target/openfire/plugins/*
-
-	dodir /opt/openfire/resources
-	insinto /opt/openfire/resources
-	doins -r target/openfire/resources/*
-
-	if use doc; then
-		dohtml -r documentation/docs/*
-	fi
-	dodoc documentation/dist/*
-
-	#Protect ssl key on upgrade
-	dodir /etc/env.d/
-	echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire
-}
-
-pkg_postinst() {
-	local src
-	local dst
-
-	# http://community.igniterealtime.org/thread/52289
-	for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
-	do
-		src="${dst}".sample
-		if [[ -f "${dst}" ]]; then
-			einfo "Leaving old '${dst}'"
-		else
-			einfo "Created default '${dst}'. Please edit."
-			cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
-			chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
-		fi
-	done
-	chown -R jabber:jabber "${ROOT}"/opt/openfire
-}
diff --git a/net-im/openfire/openfire-4.2.3-r1.ebuild b/net-im/openfire/openfire-4.2.3-r1.ebuild
index ea631de1f712..19845942c736 100644
--- a/net-im/openfire/openfire-4.2.3-r1.ebuild
+++ b/net-im/openfire/openfire-4.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND=">=virtual/jre-1.7"
diff --git a/net-im/openfire/openfire-4.2.3.ebuild b/net-im/openfire/openfire-4.2.3.ebuild
deleted file mode 100644
index 54bac0e7a976..000000000000
--- a/net-im/openfire/openfire-4.2.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2 java-ant-2 systemd
-
-MY_P=${PN}_src_${PV//./_}
-DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
-HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
-SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=virtual/jre-1.7"
-DEPEND="net-im/jabber-base
-	~dev-java/ant-contrib-1.0_beta2
-	>=virtual/jdk-1.7"
-
-S=${WORKDIR}/${PN}_src
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-}
-
-src_compile() {
-	# Jikes doesn't support -source 1.5
-	java-pkg_filter-compiler jikes
-
-	ANT_TASKS="ant-contrib"
-	eant -f build/build.xml openfire plugins $(use_doc)
-
-	# delete nativeAuth prebuilt libs:
-	#    uses outdated unmaintained libshaj, does not support amd64
-	rm -rfv target/openfire/resources/nativeAuth || die
-}
-
-src_install() {
-	dodir /opt/openfire
-
-	newinitd "${FILESDIR}"/openfire-initd openfire
-	newconfd "${FILESDIR}"/openfire-confd openfire
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	dodir /opt/openfire/conf
-	insinto /opt/openfire/conf
-	newins target/openfire/conf/openfire.xml openfire.xml.sample
-	newins target/openfire/conf/security.xml security.xml.sample
-
-	dodir /opt/openfire/logs
-	keepdir /opt/openfire/logs
-
-	dodir /opt/openfire/lib
-	insinto /opt/openfire/lib
-	doins target/openfire/lib/*
-
-	dodir /opt/openfire/plugins
-	insinto /opt/openfire/plugins
-	doins -r target/openfire/plugins/*
-
-	dodir /opt/openfire/resources
-	insinto /opt/openfire/resources
-	doins -r target/openfire/resources/*
-
-	if use doc; then
-		dohtml -r documentation/docs/*
-	fi
-	dodoc documentation/dist/*
-
-	#Protect ssl key on upgrade
-	dodir /etc/env.d/
-	echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire
-}
-
-pkg_postinst() {
-	local src
-	local dst
-
-	# http://community.igniterealtime.org/thread/52289
-	for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
-	do
-		src="${dst}".sample
-		if [[ -f "${dst}" ]]; then
-			einfo "Leaving old '${dst}'"
-		else
-			einfo "Created default '${dst}'. Please edit."
-			cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
-			chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
-		fi
-	done
-	chown -R jabber:jabber "${ROOT}"/opt/openfire
-}
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 7a7ec4c7cbf0..e87504eddf01 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.21.0_amd64.deb 74766112 BLAKE2B 16f46a291a6e3ae43f75cc4f85cd47a8faea5c343b77ea7d8b12f7ef40c11abcefddffcbd5c27e6ae9ace6eb44055886150a6c668d3d89cd449c084f697251fa SHA512 7e20e8e511ee3d90ac809dd28c17b08898a7fd0a707bb2a2381ba558af4d8f9f52deb6127cf2dd2ad001714b339ac8e3b2fd1d40f179192f0c0b0aef8d4d2996
-EBUILD signal-desktop-bin-1.21.0.ebuild 1357 BLAKE2B 509b1674cbd0bb0bc6cab228c839b3b33d380c00c378a832fc0966cfd7a5051095a1ac5908b3796fa3d261f14d44ab8da1e256d98f57de0630dbd420b2e35b00 SHA512 9938eb393fbbedb8568159cf252aa7c8f0073d373e4f092840c874774f8a660fd76e955e5db59d0b9f25aefa047512f522200d2cf3f8e8bbb4729d5c470af7c3
+DIST signal-desktop_1.21.2_amd64.deb 74745050 BLAKE2B 6000b23876abe54ba863dc5db021ab336497b211eb3d77c7addc3c183f2ac2f8918a00e61d813cbed8c23f8408323161b5b4a9762a84362ffc8d7a445f950e8e SHA512 e678dd1d006cfdbb0fb09c1803dbe958502f53ff3c57a52bb6e3079b0e6d99171512b019888d70a0222072f9da53d94c5a33f781a0fd4b0c9c9c515573eebea3
+EBUILD signal-desktop-bin-1.21.2.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.21.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.21.2.ebuild
index e4a362f0ca50..e4a362f0ca50 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.21.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.21.2.ebuild
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 17f6227725dc..32e2c9c2f4ab 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,10 +1,14 @@
 AUX telegram-desktop-bin 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
 DIST tdesktop-1.5.11.tar.gz 14244290 BLAKE2B caa37c32e93cae338eea1704cce3a4e88ba39ee9383f8a919fde560cc3e1a494ac0569d50b76f873389c0939bf9016b2900b57116a67a7055576dc64f2dd1379 SHA512 45315a769acae28a767899461ffb5f2bea6deac66f1ffc5d908d6967e8ce81c4f6a3170468dedf607d9ba8c9bcb824d2c41ef214d6484aea344e396b53b37bcb
-DIST tdesktop-1.5.8.tar.gz 14230610 BLAKE2B 4673381abf54523c602f75e7e516c78c6ec381cf9a92e75e979807d53ef8661eed5080dbde56b26ceb8407bf07fc7431df7ca848f9674c4b48b83efc5e76cf84 SHA512 d3c086643732171669451f7e96a90690c2944df5bf30c98187e33ffa853f8f8b1e682aa434df45b6b0d785d3a838aef871a29c784059c04211917975ca15a2d0
+DIST tdesktop-1.5.12.tar.gz 14252160 BLAKE2B 5f903e7dd1d749b75fa67a8956932bcd08974395c80985c5347a422b93d2eca544d2b6082de0f87769f83ba18107dc837b28ee9c4dd5f266f5d88252e7d279f0 SHA512 66887ff86d8290c2e141cf6cf50d17e72704a433fb7b9e340414107eba9ebead9c93d754baa5eef3d28717b61e7633da982d3ba5a8a68711df229437fbb67414
+DIST tdesktop-1.5.15.tar.gz 14253170 BLAKE2B f1c6ce9617892f4b37c59b6d2070a9cb4bc88f8e954a2913243fa6e72abd69c18dc9a4dc68a5811f098e7b02f5eb099952aab6db58fbdaeb7fdae0f91472e762 SHA512 952fdafaa826dfe74af18b38344c1bd57bdaa09ae66ac6cb859ab1fa907d189c6f2fce7985b1842740437511b503bdde7e7d9bd0585ba84e93dda12b66f3af29
 DIST tsetup.1.5.11.tar.xz 32436872 BLAKE2B b1e871abd039c5decc866378fa1d250acdeb33d8fd083bb5d7c1f496242af7da038561f9a7fe78dbfb7dbe5a784e77f054164e08f3da1732cc4d1e966b74aab0 SHA512 0f07468223266e20cdeb8a5cb5c7cc2fc780961578d63c893c04899bfde0bb36e77d9d4153c76fc2ca61b7b340dcc5a8d715e236c1b5aa2041c852543a5640bb
-DIST tsetup.1.5.8.tar.xz 32399784 BLAKE2B 4c64bbcb8a84d98a415f981bd719f53889ad69b74ad5204d4391cddf2f8aa4c47ff75f5a5914fb8c2a2a01eb3eb1e9eca174db4816b2fb5436c58b752b209f5a SHA512 bed0529101eacc71ad9588bbc2f50268f4d3d77bc50387200c0c6551623abf34a3424a92cb0ae1c1ebbec9698b04d59047ca672400aa45a7e93bde580c3c6928
+DIST tsetup.1.5.12.tar.xz 32461440 BLAKE2B 10f1ff27bc4adbca2fb2f79b4f6208c48ef2ee6c03e8f8c2044645dc1b057a5be0b72272b37b8f28f36a0ab9fcffe9cf8b1d04b240ba3971c376d025a6e92c7b SHA512 c73a0a6ec5c7872c1a38d68069dd83c2c319472e0605c745e4a56d2a280892198789f7a3dd6b0df7066b556f803d004a4090ea8ca2d212cb40abed20193a8230
+DIST tsetup.1.5.15.tar.xz 32450268 BLAKE2B 486a6cdd2a3a15e197b8969820cd2dd0e318b9de63144c8182a1458338c77e55d4fff4ebbbb3c88ee5209adf4f840597e8f417bc77e7057c339e0e4668c5ec2d SHA512 c8b8fec8c296c3dc1d8d7c9659b0cae7ce3aa5b5441d5d29faf155e4ab7b23dc4accaa059a3ed5e82ac1dd49903cabcabbfecf87b109c798870fdd33896d9917
 DIST tsetup32.1.5.11.tar.xz 35221340 BLAKE2B 9910d9de184553f4ebf6a32772fe1aee326fc82b532ae539495188b89971f7b5fa4992b0de4991340aa3f01b4fd3e8f09b2af71f74c4f5a6c9ec88271fe0783e SHA512 835cd3a0a65d397d94b2355bfbf70c68c6867a3f08523bd07c834258e55ca8f52f06a1d3eaf4951df3c0f0277067ebf19ceb83a53372c54f50ac9f5078dbcac7
-DIST tsetup32.1.5.8.tar.xz 35047164 BLAKE2B 5c0e648dc367f5f424aef01630f4cc3a6767a816c5a1b409fd6f0f2edc19a46520b166a90f1f17f7d3f3b4e8c3b0c326f0077588fba0d2ca6e8c2dbd12b33215 SHA512 e960e97c777b548a577c75307060ad0e1abf176fe3c1797f3ab75a26f402b3afaa11a58ed49746505ead0293b6fb629db97a0e2ed8e9841e01052871fb0567fd
+DIST tsetup32.1.5.12.tar.xz 35261680 BLAKE2B 488e8681173ab983f7f5dc037d328078cbfc8b995d9abcdf1351a38c73c18546888fabaa26b60b6530ee75231ee6bd2e0fcab9bb300aa5c74ab6bd7ad20faab7 SHA512 4710166f2c1840c41df299cb35e7ae2874d3bc1621d9ff293ba8dbcf59370e88f4542ebf9dfd9b551aaecd7539655443fdf43a6b1906758f5db1f61586ae3591
+DIST tsetup32.1.5.15.tar.xz 35264344 BLAKE2B ecc4ff8e27bd622e84ab24614d0ea1dc7c1437325baa0ed068c5e2be4e99c183a20140bb2cdcb7180d61b587c5aa61eb3ddf720fded2a9687a588ef39dc16f96 SHA512 77ce5e99bdf799b54946047c13536defb06f3c39b7e2b700a520955efdcd2e53a2fd990ca85cc9f64a6826743d7b4b2deccb7e084d4f59a1856edbabf3d2f0b8
 EBUILD telegram-desktop-bin-1.5.11.ebuild 1632 BLAKE2B 437433f439fa7032124c15a64094f92081286656429e790d222d29f59a9508dc5ca1d74edebeacc7666bce3cb56038d8f1f53cd307119348175ae0ffe23ba279 SHA512 9ed86eec52ba8f3804102e1806576b718f7b2368be6c99cbcbf361211e228a21741c4b202e9b28795dd2a3c3c046e0d1d30f26315389dd292c4fd1391300376e
-EBUILD telegram-desktop-bin-1.5.8.ebuild 1632 BLAKE2B 437433f439fa7032124c15a64094f92081286656429e790d222d29f59a9508dc5ca1d74edebeacc7666bce3cb56038d8f1f53cd307119348175ae0ffe23ba279 SHA512 9ed86eec52ba8f3804102e1806576b718f7b2368be6c99cbcbf361211e228a21741c4b202e9b28795dd2a3c3c046e0d1d30f26315389dd292c4fd1391300376e
+EBUILD telegram-desktop-bin-1.5.12.ebuild 1632 BLAKE2B 437433f439fa7032124c15a64094f92081286656429e790d222d29f59a9508dc5ca1d74edebeacc7666bce3cb56038d8f1f53cd307119348175ae0ffe23ba279 SHA512 9ed86eec52ba8f3804102e1806576b718f7b2368be6c99cbcbf361211e228a21741c4b202e9b28795dd2a3c3c046e0d1d30f26315389dd292c4fd1391300376e
+EBUILD telegram-desktop-bin-1.5.15.ebuild 1632 BLAKE2B 437433f439fa7032124c15a64094f92081286656429e790d222d29f59a9508dc5ca1d74edebeacc7666bce3cb56038d8f1f53cd307119348175ae0ffe23ba279 SHA512 9ed86eec52ba8f3804102e1806576b718f7b2368be6c99cbcbf361211e228a21741c4b202e9b28795dd2a3c3c046e0d1d30f26315389dd292c4fd1391300376e
 MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.8.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.12.ebuild
index 10f3a4e22b72..10f3a4e22b72 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.8.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.12.ebuild
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.15.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.15.ebuild
new file mode 100644
index 000000000000..10f3a4e22b72
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.15.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 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/tkabber/Manifest b/net-im/tkabber/Manifest
index 0d65c2db1ddb..a16a869ca1cd 100644
--- a/net-im/tkabber/Manifest
+++ b/net-im/tkabber/Manifest
@@ -3,5 +3,5 @@ DIST tkabber-1.1.2.tar.xz 993640 BLAKE2B 5389c2e6eefe82cf1344edf833a8f1aa3b7dafb
 DIST tkabber-plugins-0.11.1.tar.gz 615335 BLAKE2B 7e288806f3d44cc23b4447fe5caeb4bd5458cbef3329e8e49f3dd0640caaa7cf3386cd66d67413fe8f6e4176ae15ff8d2d3412684eaa82edb50cea0af3796200 SHA512 f77e4a2a3f11629796c6bdcc5ee9a782cc42ca9a43d8a9033b260df7f6260549860b6d53095067e4c3da9a1733a0570656ab807ff7853a4573c2e7f68a497014
 DIST tkabber-plugins-1.1.2.tar.xz 669580 BLAKE2B c1f15a4b49621c121a56884747ecce810fea12a784b2a1c2353dc0e94666635c391bd9d66b196900e05bf798689e4a29fe9f738f949e4ad6734541700c4b8a80 SHA512 6af7287da59f426f84ee24a0722d91106d15f939e7102c289fbe9a396b5b1b96f4fc9c3e58ceba74c1722e91d09a920d2f8e574437c8fe97382e020a911d678b
 EBUILD tkabber-0.11.1-r1.ebuild 1085 BLAKE2B 54e615ad0006b014cbb12dd28fcd2c52af048224ecae5b46f1cc561b92bcea78c3e2fb4ec9d4fca2bd514d45dda80243e8d2e24b47addf2a47db354241134d3f SHA512 4ea78131bbc587c906991b704b07f330bbcdc244dd0ca91ff21122f43780817b4d0cc8a40fea3794f5616daa1cfe636dd8ba5db4fc226cbadc1eadabe383f95a
-EBUILD tkabber-1.1.2.ebuild 1179 BLAKE2B 4dcb52149b2cc9f818bb14387e4a63c04592ae1bfcf4f660eeb2de9cb68b9e58f18a200f5822f8861503ffe06f5a679a4b3a06be42cc7a95188c943f02736632 SHA512 25b53e5e8fd68fe0639d2b8f9e6c6221a75861c221a8a0e54f4fd6df842a390db00106dcccdbb2fc012e1a4c64ff96e522b613844d31e4a487d898bdec8f88fa
+EBUILD tkabber-1.1.2.ebuild 1175 BLAKE2B fdee44b1f30d73330c000601985e66c38902018f70131323004cd16fe857b5cf869b5b8e08ec33821b3d2202ab2bda6e5dba1544919d91370cbbc521cdde9a75 SHA512 bb77c58bde2778a3d173a294d901e19a1628041dd373e21a949e2268f469295dcdf6f5114a84672fd79c16a844dc6ee5f6fbd1d806442b80203570422e01701f
 MISC metadata.xml 416 BLAKE2B f6feee2856945bb8d9c98cf54011ec369c46f5816ac44c54db7fe4186b1f3082a150b20a6e9d54c8dbb10e94785ed754ee539e4a4d503e53aba097a38e69f030 SHA512 95bb361f0dd66f6a990fbfe5f0df70e281076d779a94ae434cc36800a010b665da66b73c05c9091c88cd139cd83363b15b95644f2b0caf020b91fa93ad6d5abe
diff --git a/net-im/tkabber/tkabber-1.1.2.ebuild b/net-im/tkabber/tkabber-1.1.2.ebuild
index 1a3d4ecb6b81..25d16f8a0781 100644
--- a/net-im/tkabber/tkabber-1.1.2.ebuild
+++ b/net-im/tkabber/tkabber-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="plugins ssl"
 
 DEPEND="