gentoo resync : 03.03.2021

3 files changed, 12 insertions, 139 deletions

diff --git a/net-im/slack/Manifest b/net-im/slack/Manifest
index 02990d7079d3..93bdf288594e 100644
--- a/net-im/slack/Manifest
+++ b/net-im/slack/Manifest
@@ -1,9 +1,7 @@
 DIST slack-desktop-4.11.3-amd64.deb 57956414 BLAKE2B 3b1c2d5574fe52e27e2d489c9e4b28e28e36fb6afc2b9b18cb23352a311748be09998893dc02a78f296363fe86c6b4c36375429537c2e1d03c49457d25d4de32 SHA512 67a52a83503f273a5e3eedf8fecc83c21f249076e553537a3bacdc1d410bb435c31189c678aff9011271723918d46ba6caf82f0c2fb0c6f1cf571b11b49e8af1
 DIST slack-desktop-4.12.2-amd64.deb 57734610 BLAKE2B 249565bcb3f5fd9467d2b48e683978f406be6e3fd77f56c8e6ee328a3745800e53504f9bd618ea1764ffe429256ca5610b53996f82442e399d47f46ee5991b78 SHA512 7c0ef6e007f67c9a95c43e6544536af35d9bb55008524dade5b707aa4473db8e0837547bb91f8398728fcdc9e4ec732655cd390b49f1b5f820dc3f0b73ef9f71
-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
+DIST slack-desktop-4.13.0-amd64.deb 57716072 BLAKE2B b8f1a793239b1e101bb6eb738a8a75883bf67468886f954226552074b769355b5444bbe9273eed48575b5f245fb47bdc78e264e7329ef052305afbec88f496f4 SHA512 d324637cb96a73f6d93fb36cfee52625d9c3571115ca6a8f0e7891417dd5fa88172dcc001e1a4fc9396392fe4885c5b14d9618d82c6a97b7c688ae14f5cbe8d9
 EBUILD slack-4.11.3.ebuild 3010 BLAKE2B 2924c4d78bee81ee983dd6f712736d2e8221c95c59e76e40afeed0cac46d324dc6bd5247fb489cf578f60b6883937431a862e25ff32746fdd3b8428b3663c526 SHA512 fc49079951bddca82537a47f31253974c6c4f1b5b5269404838bf65327cfbf2dc91228412baf3aec8783e931c6ff1a575b77537d12b9a450852ce1837d975970
 EBUILD slack-4.12.2.ebuild 3010 BLAKE2B 9e164820f8f25e9eb7640608f3652130f9de7f993a71e7154d98f290113c90d0af2d835e5630886c542a68d61cefb6870ced56343285d4da2ec2326273d1bf4c SHA512 24160734c4aea7e319408faf479590df67ca45efe4d1c6c989df5cd5449c6e3698321ca29c5b05da5daf7e2b7dd62964ec58e8cd494164e7fd710397da28be21
-EBUILD slack-4.4.2.ebuild 3472 BLAKE2B 4824a79fd697889e56e232691f2fc30d552e21901259566479becfb80a0f57561ab21814085bdf472169b815e28e93c6afd7918ff98c22b9aa540b5592e157d4 SHA512 ae334d500b5cac4e20d97c3c990719251cb6a2938d4f8daf3af197b014afc4c41a809945e332a99268bda98c87e96a123d34e77aabc22547eb6c866dbc9464b3
-EBUILD slack-4.4.3.ebuild 3336 BLAKE2B 2accc46f29cd9999ba7e9024a90fae234b486cbc622978d66bb20efae3e6a705497bfbdc0a3f7c15f28c9ef9b70a065b5a8e9eb731ea661ca94fdeb000a6f1e3 SHA512 3a3ccea51349d83aa0d6527fa4d18fbc185007db21b32fdda556b88f5a306a3e94ce0a1f201e5f9fd7bc352baad4550cd03deaa50992b0901f42b274a972aea9
+EBUILD slack-4.13.0.ebuild 3170 BLAKE2B 13feb15ddce19b03df8d91327a761c1853f37cc5cd22676adda57b6fd9a62364a78f1c381e37480fd942282e594e29a8a3946cf956886601810c0ea0dd044151 SHA512 daae0fe1ffd7faee3cab0a940987a47a3c7438195df4c34f483b0eb2b1bf33404493134839a12e2912ba5a367f5de030f9cbc6a8e086d41990b3750de492b736
 MISC metadata.xml 686 BLAKE2B c0ea120b511e6be9968a728646f1af1ee6e791f5d7c8eb10d9ffd612328118bedf74ff705183995b2124c39570695c4b2a91b69d977b7fc0467cae738b664fca SHA512 f887850e1eacc25eaa94f3a249f86664454a05f7d205c67bbd89ed9afb77e1e2b5f3cf3d8596c0a3e26e70e420b486c29f07449929de2a7261aa516e2c887631
diff --git a/net-im/slack/slack-4.4.3.ebuild b/net-im/slack/slack-4.13.0.ebuild
index 8aa28b78c115..ddd396fdeba5 100644
--- a/net-im/slack/slack-4.4.3.ebuild
+++ b/net-im/slack/slack-4.13.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 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"
@@ -28,23 +28,19 @@ 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}] )"
 
@@ -52,12 +48,15 @@ QA_PREBUILT="/opt/slack/chrome-sandbox
 	/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/resources/app.asar.unpacked/node_modules/*/*/bin/linux-x64-85/*.node
+	/opt/slack/resources/app.asar.unpacked/node_modules/*/bin/linux-x64-85/*.node
 	/opt/slack/slack
 	/opt/slack/swiftshader/libEGL.so
-	/opt/slack/swiftshader/libGLESv2.so
-	/opt/slack/swiftshader/libvk_swiftshader.so"
+	/opt/slack/swiftshader/libGLESv2.so"
 
 S="${WORKDIR}"
 
@@ -97,13 +96,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
 }
diff --git a/net-im/slack/slack-4.4.2.ebuild b/net-im/slack/slack-4.4.2.ebuild
deleted file mode 100644
index 1c126432182f..000000000000
--- a/net-im/slack/slack-4.4.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit desktop multilib-build optfeature pax-utils unpacker xdg-utils
-
-DESCRIPTION="Team collaboration tool"
-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 suid"
-RESTRICT="bindist mirror"
-
-RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
-	app-accessibility/at-spi2-core: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}]
-	media-libs/alsa-lib:0[${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/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}]
-	appindicator? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
-
-QA_PREBUILT="/opt/slack/chrome-sandbox
-	/opt/slack/libEGL.so
-	/opt/slack/libffmpeg.so
-	/opt/slack/libGLESv2.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
-	/opt/slack/swiftshader/libvk_swiftshader.so"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	# remove hardcoded path, logging noise (wrt 694058, 711494)
-	sed -i  -e '/Icon/s|/usr/share/pixmaps/slack.png|slack|' \
-		-e '/Exec/s|slack|slack -s|' \
-		usr/share/applications/slack.desktop \
-		|| die "sed failed in Icon for slack.desktop"
-
-	if use appindicator ; 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/.
-
-	# this really should be done a better way than trying to parse
-	# the QA_PREBUILT variable
-	local path
-	for path in ${QA_PREBUILT}; do
-		local -a paths=(${D}/${path})
-		for path in "${paths[@]}"; do
-			fperms +x "${path#${D}/}"
-		done
-	done
-
-	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
-}
-
-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
-}