gentoo resync : 15.05.2018

7 files changed, 38 insertions, 353 deletions

diff --git a/net-im/slack-bin/Manifest b/net-im/slack-bin/Manifest
index 0c2e7af080a1..233573f17a0b 100644
--- a/net-im/slack-bin/Manifest
+++ b/net-im/slack-bin/Manifest
@@ -1,18 +1,10 @@
 DIST slack-desktop-2.1.2-amd64.deb 46460486 BLAKE2B c6478764d3bd49745f9626d85287489fd58345b1315e41fdb1bfa9b93e4201aeeb2a22678e79f584c3da26d090136c1b8b18e449b518a69a0291072b5fc05089 SHA512 b23ccee498c2c6d043bdb4632b1b2755b3f0a96a1d78338020fb4221c49b7feeb437cc358abcf285e0f0a0f7b57f4db6792b2baa8b339596a287f1272ed12284
 DIST slack-desktop-2.1.2-i386.deb 42997902 BLAKE2B e5b3375efbe00d31e34c900aedde4c6c19b0e6a550d9db6155d9f8333c9d6db241da60e9b711eee7dbf6cf89d5ac4b84050c9e89c490172b7db205f38981dca3 SHA512 6b68123d3c85687043e886974449fe424af267c326ffc869d03d911ae5d0f30f5081b611e136bc4f832da8d555b2851a4c093df9c8be2de98235ebcd03528d8c
-DIST slack-desktop-2.5.2-amd64.deb 47812458 BLAKE2B 1f066cf0c85ce0b6153a1e62737c016b162e5b7bd10651f6eb149cf2c0307487355a65a96f6341ff9f8f376c2de25dc7eb72e57509c3b1f085a15a6409d2c154 SHA512 0e8f305e33c17884bbb71cdcc236a602918e8596b00c525f155a1e0740ac02d0f99256b2afabe4381a09e6cd06e425f99b9d219bea43f113b9488c9bb0929ca9
-DIST slack-desktop-2.6.3-amd64.deb 51434914 BLAKE2B 7924e0e220c97946a5e1eb944e9ed3b01a46cc5e082fa40606667d83d68ed1de874bf98b637585c029cc674e324fd32688752c9a14644921dd585058055c5bf4 SHA512 943abc3084e395277c41f7a42feffcdeb184900c9cf0bce58bbbe6891d23b97b937fa8d47a1200e9aaa62ed0f7d4b6e3f24d41cd610cd185df570e58c31640bf
-DIST slack-desktop-2.8.0-amd64.deb 51225854 BLAKE2B 746a11d85941272c53a9c7d2433c2801fb880e6d59bf2ee1599597650a3ce59369e04b15c51af28c1e90e3375f9b9fcc88a1bf9cfc130472faafa2b7b8809be5 SHA512 9a3a8c4eec95583cde76003e99679dda9d6e44692258242bef888043666d589da8a7a5d68898f61e645a6810291ef36fea9551834c3d2fbec8e3baa6a84313d0
-DIST slack-desktop-2.8.2-amd64.deb 51257834 BLAKE2B 85f06aa634b40f3ddd1450fcfaa044bf4cf9b5a7463525ac0ee98b07cd882e0b30e0a894c8ab2e2605e3db903e570c318d6d6cb968223d59abc5013053528547 SHA512 533b360ff22ff74743fb7323c08f01230509428e752aed2ed090bf002475934063e6c3853727ab030f6267ca332d783a045df02da02a3a12d045d6a168bf5b58
-DIST slack-desktop-3.0.2-amd64.deb 55654542 BLAKE2B 70a1da6cc7be1313b02e74225ee87fbb93c0050f40301e0a02c01241efe91db9d09149fd8feeecf33786c657b53e8aec3a4d7563e61ae88e4b46f85bad27ded7 SHA512 29d7d96dbf4b81ac4164043c0cae0e314d94770b74118068684770763a52eed2a3fd430b4a307db2d133ad46cc57379a71415d92790946f5c1b448153c9bc2c1
-DIST slack-desktop-3.0.5-amd64.deb 55664624 BLAKE2B ad53ab04debf12d5af79069132a6852b03b85d1e99fc318e1e118556adc709fcd77e3bf866eed53ba34411b451ca46be42094deb6e7effde4ae8a21c9ccf1123 SHA512 a8bf160440d46ced92f70b57d8998dec957cd3a4f56813193974a9c0693ff45ad6493f74b682a9590ad3b9fbe2ac3fc01586b052e5c16f7570b0eb1430d25b12
 DIST slack-desktop-3.1.0-amd64.deb 60324688 BLAKE2B bf9184ed49d31baa8b03d430091a965434ebdb13d0e85c4872fc5ee4101782b548c817388ef3f52b2c769dd23ed931c997d2b9efe56929dae8640918b4afca38 SHA512 8b7c93e54a24bdd3b83dcaef7dbef5fe2da62719a8c84d9c0c78236a077de30bf7ebc5c29e25228fd2306594abcf3733364f6075aa08ecce1de86cb0223986b0
+DIST slack-desktop-3.1.1-amd64.deb 60320286 BLAKE2B 3054e8283b41d5b8b45323131b2a85800ba8b8e24e0b80aa0eff0c0152c7cad0a2914bf64a6b83621cf6c9ad52b9bf26c0d113cf5867d4c3f2e7d6129d4d27ae SHA512 06f209b07d1bbbadede592f4e63da7c53436ecc821585448269d4eda16ad0bdf8355ac46e508741150fae6dc883c90563509361f47dd02fda2f15b2829dda309
+DIST slack-desktop-3.2.0-beta25a7a50e-amd64.deb 57959130 BLAKE2B b7c2b68a793022b069fc0b51621003e48c06c7f4b90d18fb3e2e8133d651ff058bed83e395dc4fc251da03c3fa17d52919c1f98c5317f7166b5b72a920e441be SHA512 d55b9a6f7383c7afc30df0e020863c42a03f8736c8a668064d8bcf016f6160e6c010a14042b76860a76edb7b793e565f88d15ae75e9d8f12cd532fece1aeac4a
 EBUILD slack-bin-2.1.2.ebuild 1769 BLAKE2B c667beab3b7754601efcce865265974c3c959189b41465b055ebe8402e9369009d1a1abc486422c6267e49737e5bf51ec8608cdca74b8e20e59ccc88d8b9c7d0 SHA512 195c9b12c1ecda6afcae9cfec0710f30cac1480f5aa5f4ec6f5bd42550b6e012ab30e0be67f5c979db2be41357f47a7bbab44506c67bc23c1caa3ae43125d38b
-EBUILD slack-bin-2.5.2.ebuild 1674 BLAKE2B 483498cb605f3301cb5e7034284624ef301a6502767df5e3bc5ffe0232ef621d57ea7c8bb38ebcdde29beedbedeefb43b3fe0e5c2421f0ffe4974bb0196fc9fa SHA512 5b975220ef97fe554c46df85cf98eb51c89e48026f460d2e4cfaae1ae72c5af7e919519d2fdf28e95f3d22929caf8b5237075f57b1add35394b621bc987eb62c
-EBUILD slack-bin-2.6.3.ebuild 1674 BLAKE2B 483498cb605f3301cb5e7034284624ef301a6502767df5e3bc5ffe0232ef621d57ea7c8bb38ebcdde29beedbedeefb43b3fe0e5c2421f0ffe4974bb0196fc9fa SHA512 5b975220ef97fe554c46df85cf98eb51c89e48026f460d2e4cfaae1ae72c5af7e919519d2fdf28e95f3d22929caf8b5237075f57b1add35394b621bc987eb62c
-EBUILD slack-bin-2.8.0.ebuild 1716 BLAKE2B cf251af7426e0401f4cfaf7e93e6c7bd0c24c78ecaf1e3fec510817e44c6ad5e66365fd480a902fb521773da81fc2285020e63a9684e3247d8241207524fa04d SHA512 2f83f679d34b0e5052379081a69546e336e89ae981db1a991c0178624cc898f2f28fd7849e595c17b1fa3cdf0627796445dab7b79a19fcd61adc6c5d00ad3226
-EBUILD slack-bin-2.8.2.ebuild 1716 BLAKE2B cf251af7426e0401f4cfaf7e93e6c7bd0c24c78ecaf1e3fec510817e44c6ad5e66365fd480a902fb521773da81fc2285020e63a9684e3247d8241207524fa04d SHA512 2f83f679d34b0e5052379081a69546e336e89ae981db1a991c0178624cc898f2f28fd7849e595c17b1fa3cdf0627796445dab7b79a19fcd61adc6c5d00ad3226
-EBUILD slack-bin-3.0.2.ebuild 2513 BLAKE2B 14cdc06015c9737c4cd46e90a1786d452c39ee2f44f46651f6eb6b99b7eca0dfefe96eabb03f62395706f6b0c811b35c944d917745ec8ddb063f5bab776d10a4 SHA512 69fad06a6e3cef63f495eb2cafcd3ef17b110b5d8a3fcc66a7bf1243d0c7e3ce2b76f2e846e4808ca26189aa9504e2481a49b7849cc79536752fd280f1eeaeb4
-EBUILD slack-bin-3.0.5.ebuild 2777 BLAKE2B 7a1292b660c00b172d736e54d988f0f1b0227573b33cd185b9f1b49b3449126157c246195005bb090803313e5de9300e93147f61b0108d935897c1d0c769e8b9 SHA512 2ae82d45eb7446e71337d249d8f45feab0af86774c35475f89fa36fb443d5118418bf809e6e90bf4826dcb125bb94276b56cdcb5d71d60db97c476b3568705bb
 EBUILD slack-bin-3.1.0.ebuild 2699 BLAKE2B 8a9e783fe834acf90fe641201b3e4f7ae5d09e6f0f7bacfec54ab1ff2aec8ecf99de881a33f34ec3c2554faf02f6791462c6998f257507338ada37e752ecf091 SHA512 b6ac672083458d0fad588dae26090c4301831cd61aafcdfe97e78c8fab8d75a05a58b9cea4abd7e666430f1d78ec0831a8fdf620eb630cdd059d2db0f0db535c
+EBUILD slack-bin-3.1.1.ebuild 2701 BLAKE2B a06cfc7f770f6877e61612f913f376a600d2642bdc493e5874c1f014b3011380728ed17762c0c91bdf2f064579ce1bd4c4b714541d1e0dd792905876734f5a92 SHA512 ba60fcf61278a1849dbeeb186253f3f9b407a0ab40479dcc34a642e9339b1962c732d6813844f39a59f851e42faff829cf436723f56e497060826e83a484fcfe
+EBUILD slack-bin-3.2.0_beta2.ebuild 2742 BLAKE2B 8d95fb9418f01c62abeccc5ea2363a05aa9ba897e217107efa706efc95a1f2dde7a5034010f2acbe226efedde39a3a98abeb9a88a100ed69dcaef524fb8ee4cc SHA512 275c5b3cd4e692fef94a31c8808375f9d599f69525c685af2cfeee3de728a980c9359d2ba6c6efba00e98300ec7c8e8e01112e9a0e4a7a9ee84e2beec85bfbf7
 MISC metadata.xml 770 BLAKE2B b84907f7e6edab20de957ec2ecb5e9acb2c3167095b0a89bd41e00187d47defe6e2737324ca4b7ac2b01c16f5e12db118889bccdf3dd8b17a4ebc50b84be97e2 SHA512 6dba8262370ebbfceee5a9b8c26eca95b11271c74490ece09cec90a698d614902cec29104695692508a2d6b30a87efb1b82d44bef2edef828e26634c06aa6828
diff --git a/net-im/slack-bin/slack-bin-2.5.2.ebuild b/net-im/slack-bin/slack-bin-2.5.2.ebuild
deleted file mode 100644
index df38598b0cdb..000000000000
--- a/net-im/slack-bin/slack-bin-2.5.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/-bin/}"
-
-inherit eutils gnome2-utils unpacker xdg-utils
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="http://www.slack.com/"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="bindist mirror"
-
-RDEPEND="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-misc/curl:0
-	net-print/cups:0
-	sys-apps/dbus:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libX11:0
-	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/libxkbfile:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXtst:0
-	x11-libs/pango:0"
-
-QA_PREBUILT="opt/slack/slack
-	opt/slack/resources/app.asar.unpacked/node_modules/*
-	opt/slack/libnode.so
-	opt/slack/libffmpeg.so
-	opt/slack/libCallsCore.so"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/pixmaps
-	doins usr/share/pixmaps/${MY_PN}.png
-
-	newicon -s 512 usr/share/pixmaps/${MY_PN}.png ${MY_PN}.png
-	domenu usr/share/applications/${MY_PN}.desktop
-
-	insinto /opt/${MY_PN}
-	doins -r usr/lib/${MY_PN}/.
-	fperms +x /opt/${MY_PN}/${MY_PN}
-	dosym ../../opt/${MY_PN}/${MY_PN} usr/bin/${MY_PN}
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-im/slack-bin/slack-bin-2.6.3.ebuild b/net-im/slack-bin/slack-bin-2.6.3.ebuild
deleted file mode 100644
index df38598b0cdb..000000000000
--- a/net-im/slack-bin/slack-bin-2.6.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/-bin/}"
-
-inherit eutils gnome2-utils unpacker xdg-utils
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="http://www.slack.com/"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="bindist mirror"
-
-RDEPEND="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-misc/curl:0
-	net-print/cups:0
-	sys-apps/dbus:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libX11:0
-	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/libxkbfile:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXtst:0
-	x11-libs/pango:0"
-
-QA_PREBUILT="opt/slack/slack
-	opt/slack/resources/app.asar.unpacked/node_modules/*
-	opt/slack/libnode.so
-	opt/slack/libffmpeg.so
-	opt/slack/libCallsCore.so"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/pixmaps
-	doins usr/share/pixmaps/${MY_PN}.png
-
-	newicon -s 512 usr/share/pixmaps/${MY_PN}.png ${MY_PN}.png
-	domenu usr/share/applications/${MY_PN}.desktop
-
-	insinto /opt/${MY_PN}
-	doins -r usr/lib/${MY_PN}/.
-	fperms +x /opt/${MY_PN}/${MY_PN}
-	dosym ../../opt/${MY_PN}/${MY_PN} usr/bin/${MY_PN}
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-im/slack-bin/slack-bin-2.8.0.ebuild b/net-im/slack-bin/slack-bin-2.8.0.ebuild
deleted file mode 100644
index 02da826eadc2..000000000000
--- a/net-im/slack-bin/slack-bin-2.8.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/-bin/}"
-
-inherit eutils gnome2-utils unpacker xdg-utils
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="http://www.slack.com/"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="bindist mirror"
-
-RDEPEND="app-crypt/libsecret:0
-	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-misc/curl:0
-	net-print/cups:0
-	sys-apps/dbus:0
-	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/libxkbfile:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXtst:0
-	x11-libs/pango:0"
-
-QA_PREBUILT="opt/slack/slack
-	opt/slack/resources/app.asar.unpacked/node_modules/*
-	opt/slack/libnode.so
-	opt/slack/libffmpeg.so
-	opt/slack/libCallsCore.so"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/pixmaps
-	doins usr/share/pixmaps/${MY_PN}.png
-
-	newicon -s 512 usr/share/pixmaps/${MY_PN}.png ${MY_PN}.png
-	domenu usr/share/applications/${MY_PN}.desktop
-
-	insinto /opt/${MY_PN}
-	doins -r usr/lib/${MY_PN}/.
-	fperms +x /opt/${MY_PN}/${MY_PN}
-	dosym /opt/${MY_PN}/${MY_PN} usr/bin/${MY_PN}
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-im/slack-bin/slack-bin-2.8.2.ebuild b/net-im/slack-bin/slack-bin-2.8.2.ebuild
deleted file mode 100644
index 02da826eadc2..000000000000
--- a/net-im/slack-bin/slack-bin-2.8.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/-bin/}"
-
-inherit eutils gnome2-utils unpacker xdg-utils
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="http://www.slack.com/"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="bindist mirror"
-
-RDEPEND="app-crypt/libsecret:0
-	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-misc/curl:0
-	net-print/cups:0
-	sys-apps/dbus:0
-	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/libxkbfile:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXtst:0
-	x11-libs/pango:0"
-
-QA_PREBUILT="opt/slack/slack
-	opt/slack/resources/app.asar.unpacked/node_modules/*
-	opt/slack/libnode.so
-	opt/slack/libffmpeg.so
-	opt/slack/libCallsCore.so"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/pixmaps
-	doins usr/share/pixmaps/${MY_PN}.png
-
-	newicon -s 512 usr/share/pixmaps/${MY_PN}.png ${MY_PN}.png
-	domenu usr/share/applications/${MY_PN}.desktop
-
-	insinto /opt/${MY_PN}
-	doins -r usr/lib/${MY_PN}/.
-	fperms +x /opt/${MY_PN}/${MY_PN}
-	dosym /opt/${MY_PN}/${MY_PN} usr/bin/${MY_PN}
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-im/slack-bin/slack-bin-3.0.5.ebuild b/net-im/slack-bin/slack-bin-3.1.1.ebuild
index 711f490d302b..73cdd0095e1f 100644
--- a/net-im/slack-bin/slack-bin-3.0.5.ebuild
+++ b/net-im/slack-bin/slack-bin-3.1.1.ebuild
@@ -69,18 +69,16 @@ src_prepare() {
 }
 
 src_install() {
-	insinto /usr/share/pixmaps
-	doins usr/share/pixmaps/${MY_PN}.png
+	doicon usr/share/pixmaps/slack.png
+	doicon -s 512 usr/share/pixmaps/slack.png
+	domenu usr/share/applications/slack.desktop
 
-	newicon -s 512 usr/share/pixmaps/${MY_PN}.png ${MY_PN}.png
-	domenu usr/share/applications/${MY_PN}.desktop
+	insinto /opt/slack
+	doins -r usr/lib/slack/.
+	fperms +x /opt/slack/slack
+	dosym ../../opt/slack/slack usr/bin/slack
 
-	insinto /opt/${MY_PN}
-	doins -r usr/lib/${MY_PN}/.
-	fperms +x /opt/${MY_PN}/${MY_PN}
-	dosym ../../opt/${MY_PN}/${MY_PN} usr/bin/${MY_PN}
-
-	use pax_kernel && pax-mark -m ${ED%/}/opt/${MY_PN}/${MY_PN}
+	use pax_kernel && pax-mark -m "${ED%/}"/opt/slack/slack
 }
 
 pkg_postinst() {
diff --git a/net-im/slack-bin/slack-bin-3.0.2.ebuild b/net-im/slack-bin/slack-bin-3.2.0_beta2.ebuild
index 6f2f809380dd..430e2d4639b1 100644
--- a/net-im/slack-bin/slack-bin-3.0.2.ebuild
+++ b/net-im/slack-bin/slack-bin-3.2.0_beta2.ebuild
@@ -6,16 +6,18 @@ EAPI=6
 MY_PN="${PN/-bin/}"
 MULTILIB_COMPAT=( abi_x86_64 )
 
-inherit desktop gnome2-utils multilib-build pax-utils unpacker xdg-utils
+inherit desktop eapi7-ver gnome2-utils multilib-build pax-utils unpacker xdg-utils
+
+MY_PV=$(ver_rs 3 -)
 
 DESCRIPTION="Team collaboration tool"
 HOMEPAGE="http://www.slack.com/"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
+SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${MY_PV}5a7a50e-amd64.deb"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 -*"
-IUSE="pax_kernel"
+IUSE="ayatana pax_kernel"
 RESTRICT="bindist mirror"
 
 RDEPEND="app-crypt/libsecret:0[${MULTILIB_USEDEP}]
@@ -33,7 +35,7 @@ RDEPEND="app-crypt/libsecret: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+: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}]
@@ -47,7 +49,8 @@ RDEPEND="app-crypt/libsecret: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}]"
+	x11-libs/pango:0[${MULTILIB_USEDEP}]
+	ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
 
 QA_PREBUILT="opt/slack/slack
 	opt/slack/resources/app.asar.unpacked/node_modules/*
@@ -57,19 +60,27 @@ QA_PREBUILT="opt/slack/slack
 
 S="${WORKDIR}"
 
-src_install() {
-	insinto /usr/share/pixmaps
-	doins usr/share/pixmaps/${MY_PN}.png
+src_prepare() {
+	default
 
-	newicon -s 512 usr/share/pixmaps/${MY_PN}.png ${MY_PN}.png
-	domenu usr/share/applications/${MY_PN}.desktop
+	if use ayatana ; then
+		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
+			usr/share/applications/slack.desktop \
+			|| die "sed failed for slack.desktop"
+	fi
+}
+
+src_install() {
+	doicon usr/share/pixmaps/slack.png
+	doicon -s 512 usr/share/pixmaps/slack.png
+	domenu usr/share/applications/slack.desktop
 
-	insinto /opt/${MY_PN}
-	doins -r usr/lib/${MY_PN}/.
-	fperms +x /opt/${MY_PN}/${MY_PN}
-	dosym ../../opt/${MY_PN}/${MY_PN} usr/bin/${MY_PN}
+	insinto /opt/slack
+	doins -r usr/lib/slack/.
+	fperms +x /opt/slack/slack
+	dosym ../../opt/slack/slack usr/bin/slack
 
-	use pax_kernel && pax-mark -m ${ED%/}/opt/${MY_PN}/${MY_PN}
+	use pax_kernel && pax-mark -m "${ED%/}"/opt/slack/slack
 }
 
 pkg_postinst() {