gentoo resync : 05.12.2021

4 files changed, 2 insertions, 66 deletions

diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index c7f14aca92d5..ac8a4b92a55a 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -1,6 +1,3 @@
-AUX paho-mqtt-1.5.0-strip-test-dependency.patch 801 BLAKE2B ae44e567fea5cb08d116790191a69899c95714db4e76735fc4658174e37595b8a354e8c5fc470c035833fe3b7d27a6e47e7db77db0bab1884306144ca69379ff SHA512 aebc29ede887b5818718a56e933e9ac2342478b528f82b9d72b1132138ddbd2c97b3be2f1e5dadadec38cabf793818c6f55ea16b44336f4a40c8295b9cea0602
-DIST paho-mqtt-1.5.1.tar.gz 144740 BLAKE2B 1c218f1109476fe9b28c26e1113717448377c53a2b9e01437f93d4a29f77e3b61f59492c263f160825ddcce25f907dbf72d3078954cc378d4846afb435d79bba SHA512 7e686bcc702f70c45ab061aa9833d42c4356d5002d27a035a685ca384a5b7d5e9dfd88ac95183816e08dd131463582707acd1d2e0f6de0f7dbbb6a6d0a615c97
 DIST paho-mqtt-1.6.0.tar.gz 145605 BLAKE2B 8f8dfba1c57520793041221e470258a644a0e5c9d462244615f7d7481d1ef8ef4d3209ea9664c4f34bcd70f07addd7fbfbe5857853339b02a266ad2e43acbf90 SHA512 06a18a83b6743c816b4323324c78906ea8937366424d2c3aab3eac565dff040254f1384500cee9cff60d3931131b9f6298ae24795eaff486b03fc998140ece72
-EBUILD paho-mqtt-1.5.1.ebuild 784 BLAKE2B 1e56d3bd28d38684d35f14a83c816bf61d412c41aefc9e744533eed951348ef7607eae4cda26be0ed2afe9bf79e1fde38b5f43ba26c073083594c5098f0abe81 SHA512 a64b3236fbba8fe5377f704bd5487e7124547b9a67e36c5b909c4972b38632cc2d93db03f860ea56a8d6870a9e0800d8bc5817f392387560d84a8eacffd1e681
-EBUILD paho-mqtt-1.6.0.ebuild 635 BLAKE2B 6e2c97cf3933009b9ca7eee0139caa608b33f9c6810c0c157f315215b6ddc0b6318fea01c6d0ba8957e9d4d0909c0e79af5fda3d9263e7567e10c438f15f5e51 SHA512 d26f2084196cb031c553301c66aed1ff0c4e5198b316ff5f49a0e769d00c4263772d823a6ec12edf0b8f3b5b7e03c219df6b0521c9a7adfa1f840cdc1169509a
+EBUILD paho-mqtt-1.6.0.ebuild 633 BLAKE2B 99ceb705ae8e42787867561c788428f68148a65f7d2dcb0749e54817c30598a05e5e85cfe6c79251ddc3bebd4063e3aa015739ba51b6315b16df64b0ce902839 SHA512 481aae26df2ff61475a0cba01da3a69136ad8c94c8e38f65d2e88687e37739650ace3d3f371879ffc2f3067838ee8fd1cb80ea5c3246127c0d7cfdf23d682f5b
 MISC metadata.xml 407 BLAKE2B 4745c4fa81f796a8cecb2d8bd579e477f9a8b8983b844014aa185ae505dce602c5829db557b266dfc2c4474cde675e7bec1d0ce3e9563daacfd7c92930f72730 SHA512 25bee148e3659b941008618e3eaa6949edb8311fc2d34b120c3a0e551408ed5634f55e83a87ccdcc454437cb06b3f25527b282d546a6791d0b60202b7e5f5243
diff --git a/dev-python/paho-mqtt/files/paho-mqtt-1.5.0-strip-test-dependency.patch b/dev-python/paho-mqtt/files/paho-mqtt-1.5.0-strip-test-dependency.patch
deleted file mode 100644
index 9c8307359337..000000000000
--- a/dev-python/paho-mqtt/files/paho-mqtt-1.5.0-strip-test-dependency.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-# Remove Pylama from test dependencies.
-
-diff --git a/setup.cfg b/setup.cfg
-index 84551cd..73bd714 100644
---- 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
-index 8441de1..2878352 100644
---- 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', 'six']
-+test_requirements = ['pytest', 'six']
- needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
- setup_requirements = ['pytest-runner'] if needs_pytest else []
- extra_requirements = {'proxy': ['PySocks']}
--- 
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.5.1.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.5.1.ebuild
deleted file mode 100644
index 3af0332f43d4..000000000000
--- a/dev-python/paho-mqtt/paho-mqtt-1.5.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client class with support for MQTT v5.0, v3.1.1, and v3.1"
-HOMEPAGE="https://www.eclipse.org/paho/index.php?page=clients/python https://github.com/eclipse/paho.mqtt.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"
-
-RDEPEND=""
-DEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	) "
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.5.0-strip-test-dependency.patch"
-)
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.6.0.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.6.0.ebuild
index d920cf440c4c..a36fa328ee95 100644
--- a/dev-python/paho-mqtt/paho-mqtt-1.6.0.ebuild
+++ b/dev-python/paho-mqtt/paho-mqtt-1.6.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/paho.mqtt.python-${PV}"
 
 LICENSE="EPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="
 	test? (