gentoo Easter resync : 12.04.2020

3 files changed, 65 insertions, 7 deletions

diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 2151d3d56fa0..ad1c7991d8ba 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,3 +1,5 @@
 DIST cheroot-8.2.1.tar.gz 89470 BLAKE2B 57515ecf6e047ea67599631a98c15307ea5f9929b398a8143bc157bfe71129b11a1f4bc841f586f98167ac4c6c9680d476bd167323e5828163b4bff9bf24c360 SHA512 3f6b55c6b2403569eedb1fe7b473d3a65ad5d06cb99a38370316db38b6138b1a6921c6b7d8ba64424c5b8c20c9c58ada33da7cb8ebb6f313610f63c1f364f862
-EBUILD cheroot-8.2.1.ebuild 1757 BLAKE2B 9e25ffeca160774f857f393cc8d31f44fb043044513dd3ad12087110446fe52e89544fdb13a70988219e0d7defd6726da05702fb668979a432b8e9c955162b7b SHA512 4f85326044aa875dabf690395d86013718441b1fae9274c6799ea5208b34c4c25f2b785ac71f691382d3eae52f632478e0f5758b83dbecb0daaeccd6192a342f
+DIST cheroot-8.3.0.tar.gz 100557 BLAKE2B f5f2fd8a11a1a8660fc37030d501e93787be46dbb79cae89cb4f6915cbf3975453c0ced6ec3bc0ebfc7dc77d555f7d86ed01bd751df6b0227cac3b1b11a82ab5 SHA512 29ff39f043b1a08b9ef653a41761ac4b97de4141cf15c5394f95736d28f7fad4c501d666fe7ff61f40c55b087d022784c7fe09c995c901040b7f2a8ed16b7d14
+EBUILD cheroot-8.2.1-r1.ebuild 2251 BLAKE2B 7b4b1ac0b9b564d20ea45cb794a877a513adda7727581552920dba816d014c2cd8630d6293a7ade2e366cfa530c795eca59039ccaeeffae98c811c69066fe5b2 SHA512 646c93db76c5ac225244224e60827e3cd858515d035d1eee4eec2c67d94d3b9bc3bba567b11e039104aed0b0467dd1f16e1c8f7199ea069255629fae0cdc5e89
+EBUILD cheroot-8.3.0.ebuild 1185 BLAKE2B 33151eeb2f26465dc133586253544c068b55de29e1b6d0a93239cf2af223c333e62a8a329e03f0ae9fb56ae9651d66700c3356b05f8617b040ac71a2d336902e SHA512 8f21b427089443b95326c28664a43a94bd2a4675bf94750c965bf08385fbb0cf6377cb68baf86f8b106594203d705e5461a8d288602b10bc74dd036702c1ac24
 MISC metadata.xml 370 BLAKE2B df7ec3eb606f1557e048245eca81402f40f9cd9bc4ec8112ecb0085f65530d9a66b952d56f826b2b97733018ec4b4d31c16ac26bebd3a40f3424421255fcb770 SHA512 22ff00c4677bd898e9d88f2bdebabed6a145a9dd33d6276e997c0435c64fc9dfd396a35a88c6facc8a3844187f0b598bfe8606637ea88420a6c33e1ea9765cbf
diff --git a/dev-python/cheroot/cheroot-8.2.1.ebuild b/dev-python/cheroot/cheroot-8.2.1-r1.ebuild
index 2254cb7b0145..c01f494a39dc 100644
--- a/dev-python/cheroot/cheroot-8.2.1.ebuild
+++ b/dev-python/cheroot/cheroot-8.2.1-r1.ebuild
@@ -12,17 +12,30 @@ 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"
 # Unit tests are temporarily disabled for this version, see below for
 # what needs to be done.
 #IUSE="test"
 RESTRICT="test"
 
-RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]"
+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? (
@@ -32,12 +45,13 @@ DEPEND="${RDEPEND}
 #		>=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}]
-#		~dev-python/codecov-2.0.15[${PYTHON_USEDEP}]
-#		~dev-python/pytest-cov-2.7.1[${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() {
diff --git a/dev-python/cheroot/cheroot-8.3.0.ebuild b/dev-python/cheroot/cheroot-8.3.0.ebuild
new file mode 100644
index 000000000000..1c643f903907
--- /dev/null
+++ b/dev-python/cheroot/cheroot-8.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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"
+# Unit tests are temporarily disabled for this version, see below for
+# what needs to be done.
+#IUSE="test"
+RESTRICT="test"
+
+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}
+	test? (
+		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.2.28[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${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
+}