gentoo resync : 05.02.2020

3 files changed, 14 insertions, 112 deletions

diff --git a/net-im/slack-bin/Manifest b/net-im/slack-bin/Manifest
index 77f7686a6e65..262fa6a81a2a 100644
--- a/net-im/slack-bin/Manifest
+++ b/net-im/slack-bin/Manifest
@@ -1,12 +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-3.1.1-amd64.deb 60320286 BLAKE2B 3054e8283b41d5b8b45323131b2a85800ba8b8e24e0b80aa0eff0c0152c7cad0a2914bf64a6b83621cf6c9ad52b9bf26c0d113cf5867d4c3f2e7d6129d4d27ae SHA512 06f209b07d1bbbadede592f4e63da7c53436ecc821585448269d4eda16ad0bdf8355ac46e508741150fae6dc883c90563509361f47dd02fda2f15b2829dda309
-DIST slack-desktop-3.4.2-amd64.deb 62724122 BLAKE2B 31ab566b9a1cb80f1daa207664f4bf0504666cb388f06bf5cd5d381ab26f6b11a4eae5a4a0abd634dd562277fd291bddfb213b9285c4fab218488acc3bbd39a9 SHA512 d3d9ea70467fe59c6194430054d4bed5824a39b156ed9d215df4592eed7b63fbdb93d0a135502941805575f99bce0ec3fe266643cac731b75d9c58a760b3c1a4
-DIST slack-desktop-4.0.2-amd64.deb 61298592 BLAKE2B d6d30f75d245f78276036588eb69a579148feb18fd9232c096b95ce342d37719476eec49ec67147dcd87dbf84b60e8041c45cd6a133f48811cff33958abc43e5 SHA512 6647253eaf73022baaeacbc2e5c8a679cf1d65f8a43aec207b0aedafb74ba64b76196ee621f26097591ccd9e1aa215f2185e23b7083a4da9c89fb031f09a4471
 DIST slack-desktop-4.1.1-amd64.deb 57986912 BLAKE2B eb90dff156eb826f8f15c3ab7c7c7127a321cd73011a11c6e24bc75721f4fa981980ad5b65e4accdce2fb893ac5ad8ddba42133de8285d8a9e10ac08bdb3ed70 SHA512 57b3e7a5a81406047bb9f8f8bb8ac322d3c801fe21919a388ac1457ccc68e50dab961c86a0e36ba9bb308e1832dc2ad00a038cddbad8ea9cc70ac186b37fec7c
+DIST slack-desktop-4.3.2-amd64.deb 54914760 BLAKE2B 218d4ba6cc2057bb92b84bd8bbbf94e70022a9e65363c256190584f0a92e1615642583647af2813e02ec2eb243a3428016b1bff3bfbbc6a98f227aa63a94a967 SHA512 36536be0825e1803704304346ea9db2d1d03baddec954dea0c4560bec2b1800cf3e6d431796d1fcd3b9178e3eb070e9ae6da64e4d3949eff649050cab21d5cb2
 EBUILD slack-bin-2.1.2.ebuild 1769 BLAKE2B c667beab3b7754601efcce865265974c3c959189b41465b055ebe8402e9369009d1a1abc486422c6267e49737e5bf51ec8608cdca74b8e20e59ccc88d8b9c7d0 SHA512 195c9b12c1ecda6afcae9cfec0710f30cac1480f5aa5f4ec6f5bd42550b6e012ab30e0be67f5c979db2be41357f47a7bbab44506c67bc23c1caa3ae43125d38b
 EBUILD slack-bin-3.1.1.ebuild 2731 BLAKE2B 6a74a81ee7c1c9734e1f0176f530b4068e1b3f8b506ce7b2ebecb76a3eacfffc11b6a5e1fa7c7ad03db15763b19010297508600a1269b368a871468b65e64b3c SHA512 5b67498636859305edeb88d9317c8836a04d00208861c041387e14222a303b095c85d2236dda7312fcdfb3e2ef01e8e037050a909d96ec71be1aaaa809a40ac0
-EBUILD slack-bin-3.4.2.ebuild 2911 BLAKE2B f4e90543df17459fa06c6b4a689656f83761faa61d47bd4e7102f9167c36e1dca48b752c7d3dfcaf791b7cf96d5fd35f8064439e5aa27a5994e5d4bbb66f3241 SHA512 fc61240b411f9060109691448d9df2c198bffd1e2d8efc956cca7631104b119268209a24d9e57d273cd60ad77a8e1d66d048c2b5e4d8f725e632dd7a58330575
-EBUILD slack-bin-4.0.2.ebuild 2827 BLAKE2B e6a298d07e4c6b8987fff46ba7f09ee27bafef17b6f0fbe5524ac1f25ee6f0da734fe600107b0501fd315d37a1a5a50f1f6aae2219323fa3e0843cc8802cad99 SHA512 d744d70567e9573c5dba8cc82306cd906910b0c886aa9d7c5052e1165394ce8aa486c414180d7974b2bf94b6db608705cd81058315257002ba6a4d3325ff4960
 EBUILD slack-bin-4.1.1.ebuild 2928 BLAKE2B ba8c02c1e35ce1b759fbe47787c5ed60d26a12d24a9b2394e497e38804e3003dc03cb29520e42660d3752a1d2c46b4a072c8b07d63bf98d23739a720bb29d800 SHA512 47a641db9d39835b62d927fe8abaca3641435548b0556b1798a307f4906cf8ed02371113db2ab6338929714838d7d624058eaf0a2a2be9ffc3d02885d1fcbdbc
+EBUILD slack-bin-4.3.2.ebuild 2970 BLAKE2B 4c91170baf75aade85a99b8a874dd591c258c6e257662d40c5901ba6fe7a5b642a08511489048804f8bba387e902999e4a513db2f0de469f9bf2f7b28057fae8 SHA512 55923540730fd8a31448eec583293c2eb2cac1d5047d4a481f8c23a305db5cd017ed1ae26d5b87e19852b294979daffc46fc12663cf4347a55cf5a16a94bb9d3
 MISC metadata.xml 770 BLAKE2B b84907f7e6edab20de957ec2ecb5e9acb2c3167095b0a89bd41e00187d47defe6e2737324ca4b7ac2b01c16f5e12db118889bccdf3dd8b17a4ebc50b84be97e2 SHA512 6dba8262370ebbfceee5a9b8c26eca95b11271c74490ece09cec90a698d614902cec29104695692508a2d6b30a87efb1b82d44bef2edef828e26634c06aa6828
diff --git a/net-im/slack-bin/slack-bin-3.4.2.ebuild b/net-im/slack-bin/slack-bin-3.4.2.ebuild
deleted file mode 100644
index 2ec99996f51b..000000000000
--- a/net-im/slack-bin/slack-bin-3.4.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/-bin/}"
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit desktop multilib-build pax-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="ayatana gnome-keyring pax_kernel"
-RESTRICT="bindist mirror"
-
-RDEPEND="app-accessibility/at-spi2-atk: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-misc/curl:0[${MULTILIB_USEDEP}]
-	net-print/cups: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/libxkbfile: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}]
-	ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )
-	gnome-keyring? ( app-crypt/libsecret:0[${MULTILIB_USEDEP}] )"
-
-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
-	opt/slack/libVkICD_mock_icd.so
-	opt/slack/libEGL.so
-	opt/slack/libGLESv2.so
-	opt/slack/swiftshader/libEGL.so
-	opt/slack/swiftshader/libGLESv2.so"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	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/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/slack/slack
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-im/slack-bin/slack-bin-4.0.2.ebuild b/net-im/slack-bin/slack-bin-4.3.2.ebuild
index 4717b2533290..8211ca719da0 100644
--- a/net-im/slack-bin/slack-bin-4.0.2.ebuild
+++ b/net-im/slack-bin/slack-bin-4.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="ayatana gnome-keyring pax_kernel"
+IUSE="ayatana gnome-keyring"
 RESTRICT="bindist mirror"
 
 RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
@@ -49,22 +49,26 @@ RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
 	ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )
 	gnome-keyring? ( app-crypt/libsecret:0[${MULTILIB_USEDEP}] )"
 
-QA_PREBUILT="opt/slack/slack
+QA_PREBUILT="/opt/slack/chrome-sandbox
+	opt/slack/slack
 	opt/slack/resources/app.asar.unpacked/node_modules/*
-	opt/slack/libnode.so
 	opt/slack/libffmpeg.so
-	opt/slack/libCallsCore.so
-	opt/slack/libVkICD_mock_icd.so
 	opt/slack/libEGL.so
 	opt/slack/libGLESv2.so
 	opt/slack/swiftshader/libEGL.so
-	opt/slack/swiftshader/libGLESv2.so"
+	opt/slack/swiftshader/libGLESv2.so
+	opt/slack/swiftshader/libvk_swiftshader.so"
 
 S="${WORKDIR}"
 
 src_prepare() {
 	default
 
+	# remove hardcoded path (wrt 694058)
+	sed -i '/Icon/s|/usr/share/pixmaps/slack.png|slack|' \
+		usr/share/applications/slack.desktop \
+		|| die "sed failed in Icon for slack.desktop"
+
 	if use ayatana ; then
 		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
 			usr/share/applications/slack.desktop \
@@ -82,7 +86,7 @@ src_install() {
 	fperms +x /opt/slack/slack
 	dosym ../../opt/slack/slack usr/bin/slack
 
-	use pax_kernel && pax-mark -m "${ED%/}"/opt/slack/slack
+	pax-mark -m "${ED}"/opt/slack/slack
 }
 
 pkg_postinst() {