gentoo Easter resync : 12.04.2020

4 files changed, 39 insertions, 28 deletions

diff --git a/dev-python/slackclient/Manifest b/dev-python/slackclient/Manifest
index ac0b60f72610..30f58ee43c47 100644
--- a/dev-python/slackclient/Manifest
+++ b/dev-python/slackclient/Manifest
@@ -1,3 +1,3 @@
-DIST slackclient-1.2.0.tar.gz 14062 BLAKE2B 92f297dd0e66b81008e144a4b2b4736e43bab77abf36a7c8d4a6c295025dee856f676d9a09aa121580a6cd59dad78bfeb9595d203ac7cdb496de1440468ca1bb SHA512 4886d9fcf31bb6163f33185e68d255cf006c10c7c7c421f9ab8e4309a6d5dcf053318083153f1697e70e3489a5928a215833a7446dc0598399834bc0f9479639
-EBUILD slackclient-1.2.0.ebuild 753 BLAKE2B 4f551a9b179390eaa6cc496ee29ec9ee717e8d3e5c1d0373f5e351152c79575d425481f2a351b35468a9033ad12282be555a45174db5dee87af4d88f4c041576 SHA512 e68fcc9f0e56d7c835e6a53c402e9b4bc6bd18d61f78b94a9f085ef5aed609e5a3252101ff3afd528cac61182f3541dc48f1d8298f1113cd245ce22ebf642de0
-MISC metadata.xml 381 BLAKE2B b373bd7bca301f2bcc906e229ff17ef0cdb69482b76567cc45a98774246169d17d3f77f6eddea8a52ea6ffaf3ab20d018246ccd224e81a660634922447d0e2ff SHA512 36faa9a06a4d10f9d8c75e9ce29a69dec2a2f4fa4f8bb836aea318364ae03a63062deab63c78e8f7713ed141db49d42fea92acdd2e5beda9cae2930a90f399da
+DIST slackclient-2.5.0.tar.gz 49814 BLAKE2B 19f9e66af086d431494de0ef7f3569657eb769022223d0e9b0f74c0600858e20de397fd385dc1c41d416eb3a98a7437d2b0c1b5e156be6d98941b26749103c5b SHA512 3a7a1e741e81e673cb09f8b1d9a18ca3d0e7a0e41a7ac6062725b87752f3877548faa0f9150eb1b1775479dfe9035d03fd4d991ac108b0f634cc179f4b70e2db
+EBUILD slackclient-2.5.0.ebuild 866 BLAKE2B ae74415da506e88677a16214a33ce60e25fc942cb6998cc0425824f514608abfc30d7850d2efc5fd8e1c9f3ed089bfafb017a5065a5ad258087a864614a3c9e3 SHA512 aa4cb142b40f3033c805524e9ce00b32755acd3c1f88d2f9291b8cc8b8ccfb68ee51b527930a8039ecdfc6efe6d85d0512291feb9c89205deadc952b64324547
+MISC metadata.xml 492 BLAKE2B 080e1442246cf09dac496d27ac4d9ad8125e9c6395b4593e5f7086dda25e9ca2a878a904e7e7dd3c7eb5c5db39e82cccb1e093485e3a1138df1ae2b7b1f776a7 SHA512 b8ce210052a334d99aa307c20db50a806837d6233c223a1433d22492145829cd8549048bdcd922a61d6475fc200eaeb8703877943f4719c5a0b79bc58d9a5906
diff --git a/dev-python/slackclient/metadata.xml b/dev-python/slackclient/metadata.xml
index ce78e75e6b31..aee7e2fc6f76 100644
--- a/dev-python/slackclient/metadata.xml
+++ b/dev-python/slackclient/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/slackclient/slackclient-1.2.0.ebuild b/dev-python/slackclient/slackclient-1.2.0.ebuild
deleted file mode 100644
index 34e32aafa062..000000000000
--- a/dev-python/slackclient/slackclient-1.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Client for Slack supporting the Slack Web and Real Time Messaging API"
-HOMEPAGE="https://github.com/slackapi/python-slackclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/websocket-client-0.35[${PYTHON_USEDEP}]
-	<dev-python/websocket-client-1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.11[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${RDEPEND}"
diff --git a/dev-python/slackclient/slackclient-2.5.0.ebuild b/dev-python/slackclient/slackclient-2.5.0.ebuild
new file mode 100644
index 000000000000..2af67b3adc58
--- /dev/null
+++ b/dev-python/slackclient/slackclient-2.5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Client for Slack supporting the Slack Web and Real Time Messaging API"
+HOMEPAGE="https://github.com/slackapi/python-slackclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test" # upstream does not include tests in the package tarball!
+
+RDEPEND="
+	>dev-python/aiohttp-3.5.2[${PYTHON_USEDEP}]
+	>dev-python/aiodns-1.0.0[${PYTHON_USEDEP}]
+	"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${RDEPEND}"
+
+src_prepare() {
+	# Upstream uses pytest-runner as an extra optional target in setup.py as
+	# part of tooling to generate distfiles.
+	sed -i \
+		-e '/setup_requires=/s,"pytest-runner",,' \
+		"${S}"/setup.py || die
+	default
+}