gentoo Easter resync : 12.04.2020

4 files changed, 5 insertions, 80 deletions

diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index 14a84d6a89b0..d1f5de795a5f 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -1,7 +1,4 @@
-AUX paho-mqtt-1.3.1-strip-test-dependency.patch 681 BLAKE2B 0ed9a448e5e72813aa05ad1d37ae957150ad09b6d48a54f668a969e5e98ad25f8d55b223064e01f6773d0e42da3ba26f2e0a7f43a628ff68fee4b619b8de96c9 SHA512 dbadb8c1bd7691a973d8c1cd146ac9bd72407625ddfc5042b25bc81ff74af6d554c06fa3b2972637acc4a466e75a65c9371990e43bbf649fe5a5a22da2bb36fb
 AUX paho-mqtt-1.5.0-strip-test-dependency.patch 801 BLAKE2B ae44e567fea5cb08d116790191a69899c95714db4e76735fc4658174e37595b8a354e8c5fc470c035833fe3b7d27a6e47e7db77db0bab1884306144ca69379ff SHA512 aebc29ede887b5818718a56e933e9ac2342478b528f82b9d72b1132138ddbd2c97b3be2f1e5dadadec38cabf793818c6f55ea16b44336f4a40c8295b9cea0602
-DIST paho-mqtt-1.4.0.tar.gz 108278 BLAKE2B 0569f3cb5d262b3b7f6ae68261fe138d839afcc6fe91f880e29de24d5cf8e2491af81a30eb82c27fe63eee90114326eb75b06a32e05ec2fffed27b92d9601902 SHA512 2e49f0f146207ab4fbc8c346b10d3e2b50869b2d9db7c999b6645f7213fb635b64cff01c5405e7833a8b25334d24685ce6ed734a6e4b6b0660b48f65cf4a941c
 DIST paho-mqtt-1.5.0.tar.gz 126869 BLAKE2B 2dce27c1fcfe7ae422dc6da76fb58e7901de00c0c349b9715c56a3603da26e1f46af9bb8c0bd982043ba54a2070655b483d251a0a847e1c3afb36bcd4cfcdba8 SHA512 7e52180bf1783ee1f39aa5248730e82fae47fe3db7c4579b0b7207a29f5337c7c0af58d58aac1c265b1ed91fa9c240187d5e3005f55c6e28623e6cbc36750294
-EBUILD paho-mqtt-1.4.0.ebuild 832 BLAKE2B 1ffc21c1e68794f52bc03e2b965f6423490a851e4fdedd2b9c0c394b0f1813e95c9266a538cd1b0025e436136b0617ba26d38bbbd1950f5f6d1164ac47286727 SHA512 ddf18c0813539b838426242af0f2cb93e62a70f3a2496cdbeaad6e54378271c67b883cebc6a53ad15fe1a67548289a2212d1b1801294120870f6fab1a61670ab
-EBUILD paho-mqtt-1.5.0.ebuild 870 BLAKE2B 3c209549ddb661c638c969a08a5effc3d0722f1ad5f85ee47ae7fff77f84879537224bd82ef957e730733ccd025611e3a5d73a4ace951bea6c8d0e8f85cc60c3 SHA512 bfe74d2d95f66179545928b06095b6c4765782f77e71c1fb352b039cd3deea6efabb28bed996b13e7cb6759d1de5892ab6b83fbc91e148072cb997b567502c09
+EBUILD paho-mqtt-1.5.0.ebuild 740 BLAKE2B f07a45db3985811ee14680056c398ebb6a46798831eede1cd6e295c78e62d506f4907c111b5063b659b741557928ea95af87685fb215cd03c9005aabd0e26aea SHA512 bdf6026fad5ab85c81b74af6be1523ee740d09fff3718ce55820e08743dfe04e1b40df20a3d79e0901ee26a9e7aa9f41208c4b2924f4e424c02143abb972b9a8
 MISC metadata.xml 568 BLAKE2B 59225deb9ff08a17834330018384d076e069ce14757ee2cf57fcddc6ef847f88f02074552c6faf51584a49dd31adf2344b3dddadbceb7c04f332faebb9a1a5fe SHA512 e73d7aa7c9afa7dcb1ad78ba23e0b54070fbae667abc1127406e41b714432f59bd4c4ff60cc7a6cc17e2dbffbe0f6d78ae4f75eecf60a997e544a4b098cdf314
diff --git a/dev-python/paho-mqtt/files/paho-mqtt-1.3.1-strip-test-dependency.patch b/dev-python/paho-mqtt/files/paho-mqtt-1.3.1-strip-test-dependency.patch
deleted file mode 100644
index 0cb9750a6f54..000000000000
--- a/dev-python/paho-mqtt/files/paho-mqtt-1.3.1-strip-test-dependency.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# Remove Pylama from test dependencies.
-
-diff --git a/setup.cfg b/setup.cfg
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,9 +1,6 @@
- [aliases]
- test=pytest
- [tool:pytest]
--addopts=-r xs --pylama
-+addopts=-r xs
- strict=True
- testpaths=tests src
--[pylama]
--linters=pyflakes
--skip=tests/*
-
-diff --git a/setup.py b/setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -11,7 +11,7 @@ with open('README.rst', 'rb') as readme_file:
-     readme = readme_file.read().decode('utf-8')
- 
- requirements = []
--test_requirements = ['pytest', 'pylama']
-+test_requirements = ['pytest']
- needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
- setup_requirements = ['pytest-runner'] if needs_pytest else []
- 
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
deleted file mode 100644
index d37ae460afc2..000000000000
--- a/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client class with support for both MQTT v3.1 and v3.1.1"
-HOMEPAGE="https://www.eclipse.org/paho/clients/python/"
-SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	) "
-
-S="${WORKDIR}/paho.mqtt.python-${PV}"
-
-RESTRICT="test" #659106
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.3.1-strip-test-dependency.patch"
-	default
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild
index b60266361e63..b72e1c3b5b97 100644
--- a/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild
+++ b/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild
@@ -9,29 +9,23 @@ inherit distutils-r1
 DESCRIPTION="A client class with support for both MQTT v3.1 and v3.1.1"
 HOMEPAGE="https://www.eclipse.org/paho/clients/python/"
 SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/paho.mqtt.python-${PV}"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	) "
 
-S="${WORKDIR}/paho.mqtt.python-${PV}"
+distutils_enable_tests pytest
 
 src_prepare() {
 	eapply "${FILESDIR}/${P}-strip-test-dependency.patch"
 	default
 }
-
-python_test() {
-	esetup.py test
-}