gentoo resync : 14.12.2020

2 files changed, 25 insertions, 31 deletions

diff --git a/net-im/slack/Manifest b/net-im/slack/Manifest
index 1144f8b3bb8b..3adeb38b94ff 100644
--- a/net-im/slack/Manifest
+++ b/net-im/slack/Manifest
@@ -1,7 +1,7 @@
-DIST slack-desktop-4.3.2-amd64.deb 54914760 BLAKE2B 218d4ba6cc2057bb92b84bd8bbbf94e70022a9e65363c256190584f0a92e1615642583647af2813e02ec2eb243a3428016b1bff3bfbbc6a98f227aa63a94a967 SHA512 36536be0825e1803704304346ea9db2d1d03baddec954dea0c4560bec2b1800cf3e6d431796d1fcd3b9178e3eb070e9ae6da64e4d3949eff649050cab21d5cb2
+DIST slack-desktop-4.11.3-amd64.deb 57956414 BLAKE2B 3b1c2d5574fe52e27e2d489c9e4b28e28e36fb6afc2b9b18cb23352a311748be09998893dc02a78f296363fe86c6b4c36375429537c2e1d03c49457d25d4de32 SHA512 67a52a83503f273a5e3eedf8fecc83c21f249076e553537a3bacdc1d410bb435c31189c678aff9011271723918d46ba6caf82f0c2fb0c6f1cf571b11b49e8af1
 DIST slack-desktop-4.4.2-amd64.deb 54818266 BLAKE2B 12ce6cd423081b64919c511562c0508126d4e10f13168630b00d507c0c4b33f1291d158198ad9050008d43bd69755dd79dfa004443f83495aed7728560f318a6 SHA512 7680116ac8e438cea614484c814ed2903aab5432f8901799fdc2772471ca385a5a93d2dff43abe441ca4d4be0cae5d56c54119fb456483cfbb12c5621955f988
 DIST slack-desktop-4.4.3-amd64.deb 54827638 BLAKE2B 4847b2366b6039c41327884ffa5d74146c9d87e5e11cb6324cd8b13632c1cd94b14d72b09396e3bec321b21ff9756f1a6915b99fa3e89fa9daa544442272e7b8 SHA512 c2b9462738f6cbd8a29e75ebbac497b573676f7d95b69aca181320618a3bd1e34fd22c2b53426972cc425899afae50f4290a5754f0664b669ab6fdc1b28d1330
-EBUILD slack-4.3.2-r2.ebuild 3082 BLAKE2B d2c44288972b768e51b6825010347ced0eedc55ab3205fdf5a5ced2281d3dbc432b7ef9a1c1245e717dbec13fb41bce90b07c82c1a34ca2bcb575506bba60824 SHA512 5f5335148426d983e597c920df47625b94a6b2331805f67d65cedf6cd416b317cd1b323e79d68a191ca35bf93afa9651dd63cdf73ee62e28461edbd8b5c84c98
+EBUILD slack-4.11.3.ebuild 3010 BLAKE2B 2924c4d78bee81ee983dd6f712736d2e8221c95c59e76e40afeed0cac46d324dc6bd5247fb489cf578f60b6883937431a862e25ff32746fdd3b8428b3663c526 SHA512 fc49079951bddca82537a47f31253974c6c4f1b5b5269404838bf65327cfbf2dc91228412baf3aec8783e931c6ff1a575b77537d12b9a450852ce1837d975970
 EBUILD slack-4.4.2.ebuild 3472 BLAKE2B 4824a79fd697889e56e232691f2fc30d552e21901259566479becfb80a0f57561ab21814085bdf472169b815e28e93c6afd7918ff98c22b9aa540b5592e157d4 SHA512 ae334d500b5cac4e20d97c3c990719251cb6a2938d4f8daf3af197b014afc4c41a809945e332a99268bda98c87e96a123d34e77aabc22547eb6c866dbc9464b3
 EBUILD slack-4.4.3.ebuild 3336 BLAKE2B 2accc46f29cd9999ba7e9024a90fae234b486cbc622978d66bb20efae3e6a705497bfbdc0a3f7c15f28c9ef9b70a065b5a8e9eb731ea661ca94fdeb000a6f1e3 SHA512 3a3ccea51349d83aa0d6527fa4d18fbc185007db21b32fdda556b88f5a306a3e94ce0a1f201e5f9fd7bc352baad4550cd03deaa50992b0901f42b274a972aea9
 MISC metadata.xml 686 BLAKE2B c0ea120b511e6be9968a728646f1af1ee6e791f5d7c8eb10d9ffd612328118bedf74ff705183995b2124c39570695c4b2a91b69d977b7fc0467cae738b664fca SHA512 f887850e1eacc25eaa94f3a249f86664454a05f7d205c67bbd89ed9afb77e1e2b5f3cf3d8596c0a3e26e70e420b486c29f07449929de2a7261aa516e2c887631
diff --git a/net-im/slack/slack-4.3.2-r2.ebuild b/net-im/slack/slack-4.11.3.ebuild
index 144ff7317ced..f0b971bb4e03 100644
--- a/net-im/slack/slack-4.3.2-r2.ebuild
+++ b/net-im/slack/slack-4.11.3.ebuild
@@ -5,16 +5,16 @@ EAPI=7
 
 MULTILIB_COMPAT=( abi_x86_64 )
 
-inherit desktop multilib-build optfeature pax-utils unpacker xdg-utils
+inherit desktop multilib-build optfeature pax-utils unpacker xdg
 
 DESCRIPTION="Team collaboration tool"
-HOMEPAGE="https://www.slack.com/"
+HOMEPAGE="https://www.slack.com"
 SRC_URI="https://downloads.slack-edge.com/linux_releases/${PN}-desktop-${PV}-amd64.deb"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="appindicator"
+IUSE="appindicator suid"
 RESTRICT="bindist mirror"
 
 RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
@@ -28,35 +28,33 @@ RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
 	media-libs/mesa:0[${MULTILIB_USEDEP}]
 	net-print/cups:0[${MULTILIB_USEDEP}]
 	sys-apps/dbus:0[${MULTILIB_USEDEP}]
-	sys-apps/util-linux:0[${MULTILIB_USEDEP}]
 	x11-libs/cairo:0[${MULTILIB_USEDEP}]
 	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
 	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	x11-libs/libdrm:0[${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/libxkbcommon: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}]
 	appindicator? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
 
 QA_PREBUILT="/opt/slack/chrome-sandbox
-	opt/slack/slack
-	opt/slack/resources/app.asar.unpacked/node_modules/*
-	opt/slack/libffmpeg.so
-	opt/slack/libEGL.so
-	opt/slack/libGLESv2.so
-	opt/slack/swiftshader/libEGL.so
-	opt/slack/swiftshader/libGLESv2.so
-	opt/slack/swiftshader/libvk_swiftshader.so"
+	/opt/slack/libEGL.so
+	/opt/slack/libffmpeg.so
+	/opt/slack/libGLESv2.so
+	/opt/slack/libvk_swiftshader.so
+	/opt/slack/libvulkan.so
+	/opt/slack/resources/app.asar.unpacked/node_modules/*/*/build/Release/*.node
+	/opt/slack/resources/app.asar.unpacked/node_modules/*/build/Release/*.node
+	/opt/slack/slack
+	/opt/slack/swiftshader/libEGL.so
+	/opt/slack/swiftshader/libGLESv2.so"
 
 S="${WORKDIR}"
 
@@ -74,6 +72,9 @@ src_prepare() {
 			usr/share/applications/slack.desktop \
 			|| die "sed failed for slack.desktop"
 	fi
+
+	rm usr/lib/slack/LICENSE{,S-linux.json} \
+		|| die "rm licenses failed"
 }
 
 src_install() {
@@ -81,9 +82,10 @@ src_install() {
 	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
+	insinto /opt # wrt 720134
+	cp -a usr/lib/slack "${ED}"/opt || die "cp failed"
+
+	use suid && fperms u+s /opt/slack/chrome-sandbox # wrt 713094
 	dosym ../../opt/slack/slack usr/bin/slack
 
 	pax-mark -m "${ED}"/opt/slack/slack
@@ -92,13 +94,5 @@ src_install() {
 pkg_postinst() {
 	optfeature "storing passwords via gnome-keyring" app-crypt/libsecret
 
-	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
+	xdg_pkg_postinst
 }