[gentoo-commits] repo/gentoo:master commit in: net-im/slack/, net-im/slack-bin/, profiles/updates/, profiles/arch/amd64/x32/

[gentoo-commits] repo/gentoo:master commit in: net-im/slack/, net-im/slack-bin/, profiles/updates/, profiles/arch/amd64/x32/

[Ulrich Müller]

commit:     4f24389a363ac207d3572d67b9d1af6b7e279428
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 25 11:02:09 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 14:43:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f24389a

net-im/slack-bin: Move package to net-im/slack.

As discussed in #gentoo-dev.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 net-im/{slack-bin => slack}/Manifest                                  | 0
 net-im/{slack-bin => slack}/metadata.xml                              | 0
 net-im/{slack-bin/slack-bin-4.1.1.ebuild => slack/slack-4.1.1.ebuild} | 3 +--
 .../slack-bin-4.3.2-r1.ebuild => slack/slack-4.3.2-r1.ebuild}         | 3 +--
 .../slack-bin-4.3.2-r2.ebuild => slack/slack-4.3.2-r2.ebuild}         | 3 +--
 profiles/arch/amd64/x32/package.mask                                  | 4 ++--
 profiles/updates/1Q-2020                                              | 1 +
 7 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/net-im/slack-bin/Manifest b/net-im/slack/Manifest
similarity index 100%
rename from net-im/slack-bin/Manifest
rename to net-im/slack/Manifest

diff --git a/net-im/slack-bin/metadata.xml b/net-im/slack/metadata.xml
similarity index 100%
rename from net-im/slack-bin/metadata.xml
rename to net-im/slack/metadata.xml

diff --git a/net-im/slack-bin/slack-bin-4.1.1.ebuild b/net-im/slack/slack-4.1.1.ebuild
similarity index 96%
rename from net-im/slack-bin/slack-bin-4.1.1.ebuild
rename to net-im/slack/slack-4.1.1.ebuild
index 010dee24895..126d156dca1 100644
--- a/net-im/slack-bin/slack-bin-4.1.1.ebuild
+++ b/net-im/slack/slack-4.1.1.ebuild
@@ -3,14 +3,13 @@
 
 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="https://www.slack.com/"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
+SRC_URI="https://downloads.slack-edge.com/linux_releases/${PN}-desktop-${PV}-amd64.deb"
 
 LICENSE="all-rights-reserved"
 SLOT="0"

diff --git a/net-im/slack-bin/slack-bin-4.3.2-r1.ebuild b/net-im/slack/slack-4.3.2-r1.ebuild
similarity index 96%
rename from net-im/slack-bin/slack-bin-4.3.2-r1.ebuild
rename to net-im/slack/slack-4.3.2-r1.ebuild
index 701ae359224..354b565faab 100644
--- a/net-im/slack-bin/slack-bin-4.3.2-r1.ebuild
+++ b/net-im/slack/slack-4.3.2-r1.ebuild
@@ -3,14 +3,13 @@
 
 EAPI=7
 
-MY_PN="${PN/-bin/}"
 MULTILIB_COMPAT=( abi_x86_64 )
 
 inherit desktop eutils 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/${MY_PN}-desktop-${PV}-amd64.deb"
+SRC_URI="https://downloads.slack-edge.com/linux_releases/${PN}-desktop-${PV}-amd64.deb"
 
 LICENSE="all-rights-reserved"
 SLOT="0"

diff --git a/net-im/slack-bin/slack-bin-4.3.2-r2.ebuild b/net-im/slack/slack-4.3.2-r2.ebuild
similarity index 96%
rename from net-im/slack-bin/slack-bin-4.3.2-r2.ebuild
rename to net-im/slack/slack-4.3.2-r2.ebuild
index 588c999e230..3b995394ed5 100644
--- a/net-im/slack-bin/slack-bin-4.3.2-r2.ebuild
+++ b/net-im/slack/slack-4.3.2-r2.ebuild
@@ -3,14 +3,13 @@
 
 EAPI=7
 
-MY_PN="${PN/-bin/}"
 MULTILIB_COMPAT=( abi_x86_64 )
 
 inherit desktop eutils 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/${MY_PN}-desktop-${PV}-amd64.deb"
+SRC_URI="https://downloads.slack-edge.com/linux_releases/${PN}-desktop-${PV}-amd64.deb"
 
 LICENSE="all-rights-reserved"
 SLOT="0"

diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index b81b45733fd..5de561adc95 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -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
 
 # Hasan ÇALIŞIR <hasan.calisir@psauxit.com> (2019-10-28)
@@ -24,7 +24,7 @@ dev-libs/amdgpu-pro-opencl
 net-im/mattermost-desktop-bin
 net-im/skypeforlinux
 net-im/skype-dbus-mock
-net-im/slack-bin
+net-im/slack
 
 # Pawel Hajdan jr <phajdan.jr@gentoo.org> (2012-10-07)
 # V8 upstream said they won't support x32, bug #423815

diff --git a/profiles/updates/1Q-2020 b/profiles/updates/1Q-2020
index ebe5b8633e9..ebc4ddf2c9b 100644
--- a/profiles/updates/1Q-2020
+++ b/profiles/updates/1Q-2020
@@ -10,3 +10,4 @@ move app-doc/ghp-import dev-vcs/ghp-import
 move dev-python/git-python dev-python/GitPython
 move www-servers/automx2 net-mail/automx2
 move dev-python/pysnmp-apps net-analyzer/snmpclitools
+move net-im/slack-bin net-im/slack