gentoo resync : 14.05.2020

4 files changed, 34 insertions, 122 deletions

diff --git a/net-im/slack/Manifest b/net-im/slack/Manifest
index cae6e5b31e84..d451e0a178f9 100644
--- a/net-im/slack/Manifest
+++ b/net-im/slack/Manifest
@@ -1,6 +1,5 @@
-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-4.1.1.ebuild 2903 BLAKE2B eaa5a84332d6058d935458f232cefc64914186b9d0f2e14bee3690a2a051e3bd76144791c25ae2ed93e08900b58a407632a13b23422edc4fc7467a7a139712fd SHA512 89ba52348d649b249f2b05373e39be261e4231a4b8194f0bd0f85e34501cf8571e65dca4034e43a4a38774b439ed5cbd078de6346036b0998a0f84f82da30f0b
-EBUILD slack-4.3.2-r1.ebuild 3003 BLAKE2B 8b78fcee36ad160cb340b0c91847e761e04a0a2c76628be8d2e6b3a02f4aedddec33ac22fd4b33bab90a3363d58ec0ef2a5000ba453b43be7c1d8df5539946b3 SHA512 bbe5691b308af8219b12edab3d667e6f894c09f0fca368c20ed7d316aca0c18bca845cd2309e571e8ba4e68a9cbc0c3351493cb6d2d1107d8a2bf5e6a3e5dee4
-EBUILD slack-4.3.2-r2.ebuild 3063 BLAKE2B 34fdbf0b9c974611882119657609be3d8de3d699ce51131d48432f4957c14776844d2e43b179aa0124425ea6cee8f73ccc108e945ae54817a5acfb64e58edc18 SHA512 ddd3ee45b640580427f29afacab7e7afa4169a578a49f2743a7ea8d4d364336aa3600bfe7b6a831d6e588a515c95ed28c83f93872d4a37f941ede782be0ecb72
+DIST slack-desktop-4.4.2-amd64.deb 54818266 BLAKE2B 12ce6cd423081b64919c511562c0508126d4e10f13168630b00d507c0c4b33f1291d158198ad9050008d43bd69755dd79dfa004443f83495aed7728560f318a6 SHA512 7680116ac8e438cea614484c814ed2903aab5432f8901799fdc2772471ca385a5a93d2dff43abe441ca4d4be0cae5d56c54119fb456483cfbb12c5621955f988
+EBUILD slack-4.3.2-r2.ebuild 3078 BLAKE2B 3180be30b3d979712bb69b0829449697839815ed47d471d156876850fa5718ccde0f9cc30498d407411d99cc22d5741c26b01046e47169fedf8cf3f1b0a7e886 SHA512 5ed2867def96a8d79336ca06b14e617aac5c5d1fd03aec749f8881f55c444660e16f2655180f4fe2c7c111c2f518a841ec22b3f816be05ea4159aca28a43bec7
+EBUILD slack-4.4.2.ebuild 3468 BLAKE2B 120bb01738b51095f90c997df248e0fa8cf91dee4dac0087e1bdecefff4155e57ddeef3f789dc6ca95f45a1e2aa475e84846a7ace08bff561fd853dced4117a1 SHA512 97578b2331e5345609c95ea35c64d1e143abd464d0f04617c4a39ea48c2ec6cb2e366d43b3cebfac573519ff878314869e01b6f41abead3334607a1a4f0565f0
 MISC metadata.xml 686 BLAKE2B c0ea120b511e6be9968a728646f1af1ee6e791f5d7c8eb10d9ffd612328118bedf74ff705183995b2124c39570695c4b2a91b69d977b7fc0467cae738b664fca SHA512 f887850e1eacc25eaa94f3a249f86664454a05f7d205c67bbd89ed9afb77e1e2b5f3cf3d8596c0a3e26e70e420b486c29f07449929de2a7261aa516e2c887631
diff --git a/net-im/slack/slack-4.1.1.ebuild b/net-im/slack/slack-4.1.1.ebuild
deleted file mode 100644
index 126d156dca1c..000000000000
--- a/net-im/slack/slack-4.1.1.ebuild
+++ /dev/null
@@ -1,100 +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 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="ayatana gnome-keyring"
-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}]
-	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}]
-	ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )
-	gnome-keyring? ( app-crypt/libsecret:0[${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"
-
-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 \
-			|| 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
-
-	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/slack-4.3.2-r2.ebuild b/net-im/slack/slack-4.3.2-r2.ebuild
index 3b995394ed53..01c6e59c2cfb 100644
--- a/net-im/slack/slack-4.3.2-r2.ebuild
+++ b/net-im/slack/slack-4.3.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.slack-edge.com/linux_releases/${PN}-desktop-${PV}-amd
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="ayatana"
+IUSE="appindicator"
 RESTRICT="bindist mirror"
 
 RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
@@ -46,7 +46,7 @@ RDEPEND="app-accessibility/at-spi2-atk:2[${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}] )"
+	appindicator? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
 
 QA_PREBUILT="/opt/slack/chrome-sandbox
 	opt/slack/slack
@@ -69,7 +69,7 @@ src_prepare() {
 		usr/share/applications/slack.desktop \
 		|| die "sed failed in Icon for slack.desktop"
 
-	if use ayatana ; then
+	if use appindicator ; then
 		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
 			usr/share/applications/slack.desktop \
 			|| die "sed failed for slack.desktop"
diff --git a/net-im/slack/slack-4.3.2-r1.ebuild b/net-im/slack/slack-4.4.2.ebuild
index 354b565faab8..48b3a778dd01 100644
--- a/net-im/slack/slack-4.3.2-r1.ebuild
+++ b/net-im/slack/slack-4.4.2.ebuild
@@ -8,13 +8,13 @@ MULTILIB_COMPAT=( abi_x86_64 )
 inherit desktop eutils multilib-build pax-utils unpacker xdg-utils
 
 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="ayatana"
+IUSE="appindicator suid"
 RESTRICT="bindist mirror"
 
 RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
@@ -46,29 +46,31 @@ RDEPEND="app-accessibility/at-spi2-atk:2[${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}] )"
+	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/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 (wrt 694058)
-	sed -i '/Icon/s|/usr/share/pixmaps/slack.png|slack|' \
+	# 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 ayatana ; then
+	if use appindicator ; then
 		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
 			usr/share/applications/slack.desktop \
 			|| die "sed failed for slack.desktop"
@@ -82,7 +84,18 @@ src_install() {
 
 	insinto /opt/slack
 	doins -r usr/lib/slack/.
-	fperms +x /opt/slack/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