gentoo resync : 10.02.2020

6 files changed, 10 insertions, 190 deletions

diff --git a/net-im/slack-bin/Manifest b/net-im/slack-bin/Manifest
index 262fa6a81a2a..67bd5bb27a1c 100644
--- a/net-im/slack-bin/Manifest
+++ b/net-im/slack-bin/Manifest
@@ -1,10 +1,5 @@
-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-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-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
+EBUILD slack-bin-4.1.1.ebuild 2926 BLAKE2B 8b95487523e3f3319326e65bffc528327bb9d9b795556b13352e5288592afe3ba258b47c36e2c6fb9baf7d9145f29bdd4dbf94ffe7b68694afee1a06b6d59260 SHA512 99752a6649649e834764b43f991a2a888cbdabd361beeeac09ddf858292ba946f9897b9a4b609990c0444a11e78ff1c5757df8d082f1ca598bbfc2af7fca5c08
+EBUILD slack-bin-4.3.2-r1.ebuild 3026 BLAKE2B 226854b9d37a1cce89e4dd7039816ee9c2a5f8f83914bd2698b9ab21eb806c31ebac359a0cad0eb82af730fd172993fc012aefab165631226f3432be221c9a3a SHA512 c7ced833f00d6f6a6a6a16b2e4e579b637043f14c030d9551ce16b5120ff6c0e8cbdc91461e5f5a3779a2ce16a1b2687cf9befe48615033e5e29a18cdeeaeb9c
+MISC metadata.xml 686 BLAKE2B c0ea120b511e6be9968a728646f1af1ee6e791f5d7c8eb10d9ffd612328118bedf74ff705183995b2124c39570695c4b2a91b69d977b7fc0467cae738b664fca SHA512 f887850e1eacc25eaa94f3a249f86664454a05f7d205c67bbd89ed9afb77e1e2b5f3cf3d8596c0a3e26e70e420b486c29f07449929de2a7261aa516e2c887631
diff --git a/net-im/slack-bin/metadata.xml b/net-im/slack-bin/metadata.xml
index 200d6a674a29..15eca405ed06 100644
--- a/net-im/slack-bin/metadata.xml
+++ b/net-im/slack-bin/metadata.xml
@@ -15,9 +15,6 @@
 	All content inside Slack is searchable, including files, conversations,
 	and people.
 	</longdescription>
-	<use>
-		<flag name="pax_kernel">Triggers a paxmarking of the binary</flag>
-	</use>
 	<upstream>
 		<doc>https://get.slack.help/hc/en-us</doc>
 	</upstream>
diff --git a/net-im/slack-bin/slack-bin-2.1.2.ebuild b/net-im/slack-bin/slack-bin-2.1.2.ebuild
deleted file mode 100644
index 6a7b8f24e9b0..000000000000
--- a/net-im/slack-bin/slack-bin-2.1.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/}"
-BASE_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-_arch_.deb"
-
-inherit eutils gnome2-utils unpacker xdg-utils
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="http://www.slack.com/"
-SRC_URI="x86? ( ${BASE_URI/_arch_/i386} )
-	amd64? ( ${BASE_URI/_arch_/amd64} )"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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
-	gnome-base/libgnome-keyring:0
-	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/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.1.1.ebuild b/net-im/slack-bin/slack-bin-3.1.1.ebuild
deleted file mode 100644
index 60d3a3890b84..000000000000
--- a/net-im/slack-bin/slack-bin-3.1.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/-bin/}"
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit desktop gnome2-utils 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="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+:2[${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:2[${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"
-
-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_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-im/slack-bin/slack-bin-4.1.1.ebuild b/net-im/slack-bin/slack-bin-4.1.1.ebuild
index 158315e03e35..9441fc95cad4 100644
--- a/net-im/slack-bin/slack-bin-4.1.1.ebuild
+++ b/net-im/slack-bin/slack-bin-4.1.1.ebuild
@@ -85,7 +85,7 @@ src_install() {
 	fperms +x /opt/slack/slack
 	dosym ../../opt/slack/slack usr/bin/slack
 
-	pax-mark -m "${ED%/}"/opt/slack/slack
+	pax-mark -m "${ED}"/opt/slack/slack
 }
 
 pkg_postinst() {
diff --git a/net-im/slack-bin/slack-bin-4.3.2.ebuild b/net-im/slack-bin/slack-bin-4.3.2-r1.ebuild
index 8211ca719da0..701ae359224b 100644
--- a/net-im/slack-bin/slack-bin-4.3.2.ebuild
+++ b/net-im/slack-bin/slack-bin-4.3.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="${PN/-bin/}"
 MULTILIB_COMPAT=( abi_x86_64 )
 
-inherit desktop multilib-build pax-utils unpacker xdg-utils
+inherit desktop eutils multilib-build pax-utils unpacker xdg-utils
 
 DESCRIPTION="Team collaboration tool"
 HOMEPAGE="https://www.slack.com/"
@@ -15,10 +15,11 @@ 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"
+IUSE="ayatana"
 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}]
@@ -46,8 +47,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}] )
-	gnome-keyring? ( app-crypt/libsecret:0[${MULTILIB_USEDEP}] )"
+	ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
 
 QA_PREBUILT="/opt/slack/chrome-sandbox
 	opt/slack/slack
@@ -90,6 +90,8 @@ 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