gentoo resync : 23.09.2020

6 files changed, 4 insertions, 173 deletions

diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 467fd31289ae..5dbae404a036 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,8 +1,3 @@
-AUX cheroot-8.3.0-test-unixsocket.patch 2069 BLAKE2B c948f064e6d8f7d9b650d3fdd00be71880f2df04c928093b7e0e61c6095c854aaa1bfe0ca85e1afd480102826ea6c81766374d2886b916f98ce23e18613a5225 SHA512 0e1f04fa069917eae4267408b6f791108805ce831612cd78acf53e25ed435e38cd542b3a8d0a75cb149e55fc35daf1c24d5b6637899303861bea2e810f6e3889
-DIST cheroot-8.3.0.tar.gz 100557 BLAKE2B f5f2fd8a11a1a8660fc37030d501e93787be46dbb79cae89cb4f6915cbf3975453c0ced6ec3bc0ebfc7dc77d555f7d86ed01bd751df6b0227cac3b1b11a82ab5 SHA512 29ff39f043b1a08b9ef653a41761ac4b97de4141cf15c5394f95736d28f7fad4c501d666fe7ff61f40c55b087d022784c7fe09c995c901040b7f2a8ed16b7d14
-DIST cheroot-8.4.2.tar.gz 107264 BLAKE2B d28d602ebd442ad5d85dfb2f4618b279e733cfca9d3c516ad1fbefcd318449155819549f6b929713d51d44fbaa9a7db383af81ea65271c6646a9245e521b3178 SHA512 d0b807969d491e0b3423453d27acfbe51147f6786c0b2c8a1b4774589e3e82b027277bf0ddd5ff406f31e0ac7d9dfbd6c2f02efe6911889986e72e9f16b8e62f
 DIST cheroot-8.4.4.tar.gz 107753 BLAKE2B 4e5d9c3a101876d76696a2e6e3c191f199810e734e25cdc07aac69c102eb28b90033c6fa749569e140c01dbd08a4b06f067b4f47d34ef483d48731c6372ee5eb SHA512 18e2c198a537abd740a868fc4055c1e1e0501392c5518ec345669d02511dac2d59aa2abe2670ffb1800c5aae7032b11445488ecf7fd63d02d5923ed08b82f216
-EBUILD cheroot-8.3.0-r1.ebuild 1409 BLAKE2B bb5c42a3682198b4fd398d4a4bded944caa79b0e17721d49266e368297bba90a216ae10dc7653fd2cb1fb58fc61ff53623a407e55dc8600c4a8f04daa130be48 SHA512 ff73d49cb031988681ec77508c52cab9138b6a38d5eddc98c3f1e0d752a75870793391677f575ece594be53aa7b4d72f482139cd0f291ed52023e2cc743f20ef
-EBUILD cheroot-8.4.2.ebuild 1526 BLAKE2B 7488df772797ad6e224ecfed10fba4b5fc1a1d7a851b8c9c18b93b3e8347d24f3168e9304ab5541a078be27c1afc5cd9a2494e0b8124f89555502e8e8debd876 SHA512 17ba3882fb2814fe369cbb7d464ebe706462dc6200bfa1cff31965d4634b0e34297c485132f0bc38010c5bd4cb2e2f2667b7d6caefbd714762bd8ab5a61e9131
-EBUILD cheroot-8.4.4.ebuild 1529 BLAKE2B 9d0e3bda85a726d08e7e5f145e4a5e814239c6d7574bc93d9f15b4c04609b542693b728f35becb45657601f17e656e26e3167807418ad13f31539be01cf211ac SHA512 17db137994110789ff496c40a0b2d10efb7913de0c9902cd4bb5498483c704eaad09d808948767c805f9c9efd1a956fbf3fb3d0641cddef4f95b62edb9874cc7
-MISC metadata.xml 471 BLAKE2B e623692550af72f63a0df84767bfadcf9ee16beafc4f467cc6bd83d7a0deca6a66d73f9041e3e37a967a4d7451eebe0d9f7974e43ce90b2dac24134ed7aa6496 SHA512 19c39b453a668408550b250a96af25ea12c8a46285070aa4a1b1d7c3e6b4ee36ac287ead410e6b798d4fa607543d58c5cc8bec0f00992206d2a231de983b5976
+EBUILD cheroot-8.4.4.ebuild 1524 BLAKE2B f960b663a86ac5d31ba5966f4618c4ea378ba8261861ef5da20e237877a7a225e0dbfc9b9ec2581dfa67a3968bcee21b79d5e0316f0d43c33ac641808ed8a5de SHA512 42d487dfa1ddaaa1b054e82df553d421af770160ab7ff3f0e60d7036bb6945dc69cf590d88baac39c1c04f36867a91ce435c7e8ef6bf9a7312fb1ff2cf0f5820
+MISC metadata.xml 495 BLAKE2B 10d63d06fd73012b64f27454cb1eb862d49b42457c90081e2d830a37939df8fe92b25c482f7f389fdab02eac56988a5212b3006c2ad41d3056a0c787ad44b7c1 SHA512 244f8755ee65b71e3350df78503f97c7d814b766302371905219dd937a887461df709d1e142326ebe1902c70a6a5940d748067ce975330377c7358ef9e57675f
diff --git a/dev-python/cheroot/cheroot-8.3.0-r1.ebuild b/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
deleted file mode 100644
index 5344578553de..000000000000
--- a/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
-HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
-SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
-
-RDEPEND="
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jaraco-text[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/cheroot-8.3.0-test-unixsocket.patch
-)
-
-python_prepare_all() {
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e '/setuptools_scm/d' -i setup.cfg || die
-	sed -e '/--cov/d' \
-		-e '/--testmon/d' \
-		-e '/--numproc/d' \
-		-i pytest.ini || die
-
-	# broken
-	sed -e '/False.*localhost/d' \
-		-i cheroot/test/test_ssl.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cheroot/cheroot-8.4.2.ebuild b/dev-python/cheroot/cheroot-8.4.2.ebuild
deleted file mode 100644
index f2b6dddf9229..000000000000
--- a/dev-python/cheroot/cheroot-8.4.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
-HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
-SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ia64 ppc ~ppc64 ~x86"
-
-RDEPEND="
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jaraco-context[${PYTHON_USEDEP}]
-		dev-python/jaraco-text[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e '/setuptools_scm/d' -i setup.cfg || die
-	sed -e '/--cov/d' \
-		-e '/--testmon/d' \
-		-e '/--numproc/d' \
-		-i pytest.ini || die
-
-	# broken
-	sed -e '/False.*localhost/d' \
-		-i cheroot/test/test_ssl.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cheroot/cheroot-8.4.4.ebuild b/dev-python/cheroot/cheroot-8.4.4.ebuild
index 467ee0e31e3f..2685ff644e7c 100644
--- a/dev-python/cheroot/cheroot-8.4.4.ebuild
+++ b/dev-python/cheroot/cheroot-8.4.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cheroot/files/cheroot-8.3.0-test-unixsocket.patch b/dev-python/cheroot/files/cheroot-8.3.0-test-unixsocket.patch
deleted file mode 100644
index 311489565301..000000000000
--- a/dev-python/cheroot/files/cheroot-8.3.0-test-unixsocket.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 6ead1efb37edfade4dda60e48d1af8fe89be3cdc Mon Sep 17 00:00:00 2001
-From: "Jason R. Coombs" <jaraco@jaraco.com>
-Date: Sun, 12 Apr 2020 16:28:00 -0400
-Subject: [PATCH] Remove client from peercreds tests. Fixes #276.
-
----
- cheroot/test/test_server.py | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/cheroot/test/test_server.py b/cheroot/test/test_server.py
-index 80728d66..6c4b53ee 100644
---- a/cheroot/test/test_server.py
-+++ b/cheroot/test/test_server.py
-@@ -23,7 +23,6 @@
-     ANY_INTERFACE_IPV4,
-     ANY_INTERFACE_IPV6,
-     EPHEMERAL_PORT,
--    get_server_client,
- )
- 
- 
-@@ -171,19 +170,19 @@ def send_payload(self, payload):
- 
- 
- @pytest.fixture
--def peercreds_enabled_server_and_client(http_server, unix_sock_file):
-+def peercreds_enabled_server(http_server, unix_sock_file):
-     """Construct a test server with ``peercreds_enabled``."""
-     httpserver = http_server.send(unix_sock_file)
-     httpserver.gateway = _TestGateway
-     httpserver.peercreds_enabled = True
--    return httpserver, get_server_client(httpserver)
-+    return httpserver
- 
- 
- @unix_only_sock_test
- @non_macos_sock_test
--def test_peercreds_unix_sock(peercreds_enabled_server_and_client):
-+def test_peercreds_unix_sock(peercreds_enabled_server):
-     """Check that ``PEERCRED`` lookup works when enabled."""
--    httpserver, testclient = peercreds_enabled_server_and_client
-+    httpserver = peercreds_enabled_server
-     bind_addr = httpserver.bind_addr
- 
-     if isinstance(bind_addr, six.binary_type):
-@@ -212,9 +211,9 @@ def test_peercreds_unix_sock(peercreds_enabled_server_and_client):
- )
- @unix_only_sock_test
- @non_macos_sock_test
--def test_peercreds_unix_sock_with_lookup(peercreds_enabled_server_and_client):
-+def test_peercreds_unix_sock_with_lookup(peercreds_enabled_server):
-     """Check that ``PEERCRED`` resolution works when enabled."""
--    httpserver, testclient = peercreds_enabled_server_and_client
-+    httpserver = peercreds_enabled_server
-     httpserver.peercreds_resolve_enabled = True
- 
-     bind_addr = httpserver.bind_addr
diff --git a/dev-python/cheroot/metadata.xml b/dev-python/cheroot/metadata.xml
index 20224dac30c7..9a033da645df 100644
--- a/dev-python/cheroot/metadata.xml
+++ b/dev-python/cheroot/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Cheroot</remote-id>
 		<remote-id type="github">cherrypy/cheroot</remote-id>