gentoo resync : 25.08.2020

5 files changed, 81 insertions, 80 deletions

diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index e0c7c55b7e24..cc1aa8854ffd 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,7 +1,8 @@
 AUX cheroot-8.3.0-test-unixsocket.patch 2069 BLAKE2B c948f064e6d8f7d9b650d3fdd00be71880f2df04c928093b7e0e61c6095c854aaa1bfe0ca85e1afd480102826ea6c81766374d2886b916f98ce23e18613a5225 SHA512 0e1f04fa069917eae4267408b6f791108805ce831612cd78acf53e25ed435e38cd542b3a8d0a75cb149e55fc35daf1c24d5b6637899303861bea2e810f6e3889
-DIST cheroot-8.2.1.tar.gz 89470 BLAKE2B 57515ecf6e047ea67599631a98c15307ea5f9929b398a8143bc157bfe71129b11a1f4bc841f586f98167ac4c6c9680d476bd167323e5828163b4bff9bf24c360 SHA512 3f6b55c6b2403569eedb1fe7b473d3a65ad5d06cb99a38370316db38b6138b1a6921c6b7d8ba64424c5b8c20c9c58ada33da7cb8ebb6f313610f63c1f364f862
 DIST cheroot-8.3.0.tar.gz 100557 BLAKE2B f5f2fd8a11a1a8660fc37030d501e93787be46dbb79cae89cb4f6915cbf3975453c0ced6ec3bc0ebfc7dc77d555f7d86ed01bd751df6b0227cac3b1b11a82ab5 SHA512 29ff39f043b1a08b9ef653a41761ac4b97de4141cf15c5394f95736d28f7fad4c501d666fe7ff61f40c55b087d022784c7fe09c995c901040b7f2a8ed16b7d14
-EBUILD cheroot-8.2.1-r1.ebuild 2249 BLAKE2B 75bb493262711a58088d4539c27157dd37638e521e89c7e2f2675421d38346a62332dc9b71c183d56a7560f491636f05c894d01aed0a8b10c63cd5d08e5ab006 SHA512 8ca74fe3a2a5160b228cd7009550a8d9f59dc6c85c3614167716c4d1188aeece0c774ab4d711e76615476ab5315f2b4c9133e6d4b1a2df967e120d05717a99c6
-EBUILD cheroot-8.3.0-r1.ebuild 1414 BLAKE2B 68c9dd50562bb0d7a872497e53272dbff24024859ee4a8ce25f79968ebfdf9236b3fb8a9d6be6b66d54f7c383dd62e7b87d7863482a3d1cc3a50017570a78193 SHA512 fd4d32399fa25060947a7e244d1b7b199da923a519256403a16d58113701441769f6f84eaec77d15a826102f0507fa7084d1e7f0426627adbdf8b4a133d1dfd5
-EBUILD cheroot-8.3.0.ebuild 1182 BLAKE2B 1b1582713afb603c4eab37fdfe7e7c1fdc6569f56694caaefa6629e847b71578ca8f6b256aa6347d114c5d42e09d678771cacd9a217625d416b93e573eb40cce SHA512 2ffa8686cb0fa46bdddf9277467558c8a16bae879b0a80fe6f31fe58e413f6249117068f66b7a83c2b9c4ddfd7809a9753b9eb426cae44aa63300ac9438567df
+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 1529 BLAKE2B 9d0e3bda85a726d08e7e5f145e4a5e814239c6d7574bc93d9f15b4c04609b542693b728f35becb45657601f17e656e26e3167807418ad13f31539be01cf211ac SHA512 17db137994110789ff496c40a0b2d10efb7913de0c9902cd4bb5498483c704eaad09d808948767c805f9c9efd1a956fbf3fb3d0641cddef4f95b62edb9874cc7
+EBUILD cheroot-8.4.4.ebuild 1529 BLAKE2B 9d0e3bda85a726d08e7e5f145e4a5e814239c6d7574bc93d9f15b4c04609b542693b728f35becb45657601f17e656e26e3167807418ad13f31539be01cf211ac SHA512 17db137994110789ff496c40a0b2d10efb7913de0c9902cd4bb5498483c704eaad09d808948767c805f9c9efd1a956fbf3fb3d0641cddef4f95b62edb9874cc7
 MISC metadata.xml 471 BLAKE2B e623692550af72f63a0df84767bfadcf9ee16beafc4f467cc6bd83d7a0deca6a66d73f9041e3e37a967a4d7451eebe0d9f7974e43ce90b2dac24134ed7aa6496 SHA512 19c39b453a668408550b250a96af25ea12c8a46285070aa4a1b1d7c3e6b4ee36ac287ead410e6b798d4fa607543d58c5cc8bec0f00992206d2a231de983b5976
diff --git a/dev-python/cheroot/cheroot-8.2.1-r1.ebuild b/dev-python/cheroot/cheroot-8.2.1-r1.ebuild
deleted file mode 100644
index 1cb11261efd9..000000000000
--- a/dev-python/cheroot/cheroot-8.2.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-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"
-# Unit tests are temporarily disabled for this version, see below for
-# what needs to be done.
-#IUSE="test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-#	doc? (
-#		>=dev-python/sphinx-1.8.2[${PYTHON_USEDEP}]
-#		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-#		>=dev-python/sphinx-tabs-1.1.0[${PYTHON_USEDEP}]
-#		dev-python/docutils[${PYTHON_USEDEP}]
-#		dev-python/alabaster[${PYTHON_USEDEP}]
-#		dev-python/python-dateutil[${PYTHON_USEDEP}]
-#		>=dev-python/sphinxcontrib-spelling-4.3.0[${PYTHON_USEDEP}]
-#	)
-
-	# Add the following for unit tests, some packages listed will need
-	# to be added and keyworded appropriately.
-#	test? (
-#		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-#		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
-#		>=dev-python/pytest-sugar-0.9.1[${PYTHON_USEDEP}]
-#		>=dev-python/pytest-testmon-0.9.7[${PYTHON_USEDEP}]
-#		~dev-python/pytest-watch-4.2.0[${PYTHON_USEDEP}]
-#		>=dev-python/pytest-xdist-1.2.28[${PYTHON_USEDEP}]
-#		~dev-python/coverage-4.5.3[${PYTHON_USEDEP}]	#undesired
-#		~dev-python/codecov-2.0.15[${PYTHON_USEDEP}]	#undesired
-#		~dev-python/pytest-cov-2.7.1[${PYTHON_USEDEP}]	#undesired
-#		>=dev-python/trustme-0.4.0[${PYTHON_USEDEP}]
-#		dev-python/pyopenssl[${PYTHON_USEDEP}]
-#		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-#		>=dev-python/jaraco-text-3.1[${PYTHON_USEDEP}]
-#	)"
-
-#python_test() {
-#	py.test -v || die "tests failed under ${EPYTHON}"
-#}
-
-python_prepare_all() {
-	distutils-r1_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
-}
diff --git a/dev-python/cheroot/cheroot-8.3.0-r1.ebuild b/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
index 70a6ae89fac9..5344578553de 100644
--- a/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
+++ b/dev-python/cheroot/cheroot-8.3.0-r1.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/cheroot-8.3.0.ebuild b/dev-python/cheroot/cheroot-8.4.2.ebuild
index 0124db04df17..467ee0e31e3f 100644
--- a/dev-python/cheroot/cheroot-8.3.0.ebuild
+++ b/dev-python/cheroot/cheroot-8.4.2.ebuild
@@ -13,30 +13,42 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
-# Unit tests are temporarily disabled for this version, see below for
-# what needs to be done.
-#IUSE="test"
-RESTRICT="test"
+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="${RDEPEND}
+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/pytest-xdist-1.2.28[${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() {
-	distutils-r1_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
new file mode 100644
index 000000000000..467ee0e31e3f
--- /dev/null
+++ b/dev-python/cheroot/cheroot-8.4.4.ebuild
@@ -0,0 +1,54 @@
+# 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
+}