gentoo Easter resync : 12.04.2020

6 files changed, 153 insertions, 4 deletions

diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 2be02074cd63..31b502cf84fe 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,10 +1,15 @@
+AUX cherrypy-18.5.0-tests.patch 710 BLAKE2B 1e4e4b6ac77f759c4f4814e37da3a320f72e3d7bc76b1ebfb6db5c181d07ce49b15d2f83f83a1748c1d5fd8e6dab6ca8fe3cf62ca24f487059fc8ec4175f3f02 SHA512 c469aad925f71c2b417214b153c3de501679c72f1ebdd5f05285dda2486375964f1d30e6623bbec8ef3bb07dd58772fc847ded3d1d0e43654a2bc12ac98ad07e
 DIST CherryPy-13.1.0.tar.gz 687221 BLAKE2B ab9c8f50026e26d171877e4e68f1c5a53fa8519190bcc577e12999cdf8a7f52be37f4ba9ed83a276a9f33676839ec63bff68aa8f9f51ddf15557e09123bf2530 SHA512 c32cf009d6a5b557560a00cde0f47a01ae481c7f60b7f340e5c99bf2d7c757e7c7cbf3ef2f4f71c172057aa09ca332f2d211cc97623ea29ba9f17287c7bc42dd
 DIST CherryPy-17.4.1.tar.gz 684113 BLAKE2B 8922c1f6c3e7ac654f84dbc56c7ae17e9ba83e01132dc6a34413064879a5fe22b1dcaa0eac7415b23cf9dc4fe54fd3e5d078121b354599b30c89f69f107208f6 SHA512 588aef80b12bdd27d83fabd466add12753d62760cd0c6beca8ecb78a0cd1e04a507327409bd4cd3c6e6e6133922e06c2f8c6ee2877b42ca635f8001812a4bd8e
+DIST CherryPy-17.4.2.tar.gz 684366 BLAKE2B 428c209b2ea3061e70c932a781166099f323b522d855b640f0869f19c7a6a6f00d9c4121f51c71ff2cc3d332f6451accffa2a8cc0c424e3fd0c62d9bfd69845c SHA512 1f06d8228b45161773095dd05e163fa55ad0060ac6f740051294aa2ecc53036c367fe5a5ef327a8fd56b5a4afd1f8550ef00a3f71fcc13c6124d772e77459ff4
 DIST CherryPy-18.1.0.tar.gz 682792 BLAKE2B 0e072bf21656778ff8d64e87a6b19c8c5e9a3057312ebd3155b3b876432709f6f205f267cd9a105727153d458daab3e7113ffe9b3c49f911bd956bf72a19086c SHA512 58ae40ef62efeda051bf5dd35768a599094792d06a0e7c6e34c21cc5b003b700f43a02460d38a00067d255939e341fc438d248e3499fad76ccc8100f8eac94d3
+DIST CherryPy-18.5.0.tar.gz 685362 BLAKE2B 36178ff6e374a89aa4fba9ba34947f1558a7bb3676f014528bb081efa9608ed70648bf2c46b8c4f95b8b14586a93c513ce342955677564f9202733104ba07102 SHA512 6ead115ac2a067cc9f2cb83117b8c53aac8a2a1580159993b7687b5810a41b64d1d1c603ef75a12660fe7aee9c6f403c8cb7bd5e78564f71dc813ae7f28b65fe
 DIST CherryPy-3.8.0.tar.gz 433711 BLAKE2B e1b4a554138a61e8c6313c3055723583d812e573a352d67bd5448f799e4f2f22694b800810b53cd041c665e46d9555b471d1da91c252ade96459778d7a5c07fa SHA512 25f84093e30d814c0980f7d77b98492113470c3297c66ee8652e40650757f8e2b7db01bb8de6d7a1ea9b4bed8b764502b1f563ac6f0d082970bc2d46739d19c2
 EBUILD cherrypy-13.1.0-r1.ebuild 1323 BLAKE2B 2d56bf87bf3b6179eec66a8b02c66f98f35c3c129fed2a31cdcc4163faa2658bcc53b72284ae0b82cca529b9abbb7677f9964241808047bd22d712cc77329eea SHA512 a53f1c3734d389d784ac49419f289bda1b8576f6d066c0b5d0c80aa0075ab2587874e875121882337938cf799af2415681976e8c1960e49de6bab2d9799c5f89
 EBUILD cherrypy-13.1.0.ebuild 1318 BLAKE2B 29ec8e6e740e8d9446001a47f0aa4a505748787dd7efc6db4c8bad98c4e2f1920f0012661d43ab64aced90c88d8b682f2e91d6e8f5fc0a14c890b5f9d4154a32 SHA512 6e00d1aac14b81b6a6f7e2388450071b3da8c6ffa4d1ee67e3d4b5718ef19e61cadf58d4579041f02d36848fdfd8361fa7a1f7b8a1a8993d4e6c9d7777a24bdd
 EBUILD cherrypy-17.4.1-r1.ebuild 1858 BLAKE2B 50ceddf735fed91acaf24a1dfda0be11c53546a58ddf18f70006d493b70a2cc4155248120f53a3835c3729a832fce25bdf71d0927fa69f61d820ae73d9cb7b18 SHA512 8627a1d9158b7a11cdc75346337dbd4202df9b6b15e44b0da7fded16501e89065d67eef9be68d10ca10b1643ee0c02e271979a12d6e01c6cf68d621c6167aff3
-EBUILD cherrypy-18.1.0-r1.ebuild 1872 BLAKE2B f2a9c15719048d83b23266e60b98af4d562ae2a8cc73f50ae76db69ec9c433f731c81596994f22f49b780ca99781e9538bd5f2fd55f3e3fcce9a44ab924ed0de SHA512 4ce3ab84dbafdfa252de809c875790b3baa2f866934b8cd85a7db991131ab5e08e2adf5bfddaccc3dc7fbcdcb651455dd28301b1a297a69aa628dca6289342ba
-EBUILD cherrypy-3.8.0.ebuild 1638 BLAKE2B fc1554365a6c1c818e8145620f84e44af8435b3985a0e9f09399ecf2ca0515317aa19181970950127bc999df645d157469d5f2de5ae19e4d2f3eadbf5a6ae9ec SHA512 3d00b0dedc631498090a3cbe5d53185d1ed329f684baf9a4418912cf35374920eff3611354c85c69237762de9baedae2b7791937d2f4d9bdc260bdfaf68bee15
+EBUILD cherrypy-17.4.2.ebuild 1846 BLAKE2B 9247d995677b473a0584bc856287e4cc807163e99d9be95d8e94d263cf8ba1a696a7eaf194fdb6581634f763725afd3bc07d8e332deafe17e3f30f33c9d7ffea SHA512 6522372b5027ad613eaae2eb4f32646b20f0bf408471cca69fcca0da7895951b45e49b3814be5f9f1cd8ee7511c8173dfceca9925c299ac306061fbc1dfede0d
+EBUILD cherrypy-18.1.0-r1.ebuild 1871 BLAKE2B 3d2a09d94ef96db97c6e74e17b6dbad7fc82d5d055f356647cd6856e680b43d48384ed7dbed3a578b4e7eae9b44fb25d3706652e8809982900350d7d73bb6e4d SHA512 73b1f4694b8bea3f2179678a03898e585170f856c6bd51a5f5dca3e1c2c374e552486a2c87c5f248832d20aa2dfc6e55c95e6c8309c2afbb85f46d0bae6b5264
+EBUILD cherrypy-18.5.0.ebuild 1828 BLAKE2B ee89bf34a693bc7d928b4622829da13e98750c1b0ef2edc9519b4dfcbdd84e1d0301b6a342ec0661c4cb50c2235018e9259a6bbf2129bcb2103ff295ebda29ed SHA512 a439112414ffcdccff7ec37ac158aa3da01c7f164248a75f370792f23a0724acf3846a4501466758b8c7a20837672a99fca59215d6443b0e31d1d6cd5f091b3b
+EBUILD cherrypy-3.8.0.ebuild 1639 BLAKE2B 404e81cf1f8e8752663409c02e3aad85d3e0088a6af5238fc745cf96fb81070ffb355a06d08e458a9de66f2d1753ebf753b6bc974b3972b7acc582d80b88d876 SHA512 3dbb263af36b1243536446022750e8f30f4bc629cee442bd39263d3d86658fe3aade5094929a469a43bca44cdca4bcbf92312e3f5f9a4d72f0688653553642df
 MISC metadata.xml 321 BLAKE2B 6636b11693e6e9d09f579bc88b203bd7c41f67222887365de5db2c3aca4c34d8cb2e341f217240ce562f43d60e78221442c12b08f2f7e516c36e06d928a9a995 SHA512 c777da5d545e3d626d663830437ec91a8f228c58734c7df4e4a16f0609904a5ad4613310d2d05b4e8ea89053371ad0bd4f0624137afe54ff6c4f5d9eef734d10
diff --git a/dev-python/cherrypy/cherrypy-17.4.2.ebuild b/dev-python/cherrypy/cherrypy-17.4.2.ebuild
new file mode 100644
index 000000000000..5e7872d3abe8
--- /dev/null
+++ b/dev-python/cherrypy/cherrypy-17.4.2.ebuild
@@ -0,0 +1,61 @@
+# 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
+
+MY_P="CherryPy-${PV}"
+
+DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
+HOMEPAGE="https://www.cherrypy.org https://pypi.org/project/CherryPy/"
+SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ssl test"
+
+# tests fail hard with no error, i have no idea how to debug
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
+	>=dev-python/portend-2.1.1[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/zc-lockfile[${PYTHON_USEDEP}]
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	dev-python/contextlib2[${PYTHON_USEDEP}]
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+#	test? (
+#		dev-python/routes[${PYTHON_USEDEP}]
+#		dev-python/simplejson[${PYTHON_USEDEP}]
+#		dev-python/objgraph[${PYTHON_USEDEP}]
+#		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+#		dev-python/path-py[${PYTHON_USEDEP}]
+#		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+#	)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# UnicodeEncodeError: 'ascii' codec can't encode character u'\u2603' in position 0: ordinal not in range(128)
+	sed -e 's|@pytest.mark.xfail(py27_on_windows|@pytest.mark.xfail(sys.version_info < (3,)|' \
+		-i cherrypy/test/test_static.py || die
+
+	sed -r -e '/(pytest-sugar|pytest-cov)/ d' \
+		-i setup.py || die
+
+	sed -r -e 's:--cov-report[[:space:]]+[[:graph:]]+::' \
+		-e 's:--cov[[:graph:]]+::' \
+		-e 's:--doctest[[:graph:]]+::' \
+		-i pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild b/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild
index d48277a31700..2c62170096e4 100644
--- a/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 IUSE="ssl"
 # IUSE="ssl test"
 # See below to see what needs to be done before testing can be enabled
diff --git a/dev-python/cherrypy/cherrypy-18.5.0.ebuild b/dev-python/cherrypy/cherrypy-18.5.0.ebuild
new file mode 100644
index 000000000000..ebfb5555a416
--- /dev/null
+++ b/dev-python/cherrypy/cherrypy-18.5.0.ebuild
@@ -0,0 +1,62 @@
+# 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
+
+MY_P="CherryPy-${PV}"
+
+DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
+HOMEPAGE="https://www.cherrypy.org https://pypi.org/project/CherryPy/"
+SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="ssl test"
+
+RDEPEND=">=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
+	>=dev-python/portend-2.1.1[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/zc-lockfile[${PYTHON_USEDEP}]
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/routes[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		dev-python/objgraph[${PYTHON_USEDEP}]
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+		dev-python/pytest-services[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/cherrypy-18.5.0-tests.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# UnicodeEncodeError: 'ascii' codec can't encode character u'\u2603' in position 0: ordinal not in range(128)
+	sed -e 's|@pytest.mark.xfail(py27_on_windows|@pytest.mark.xfail(sys.version_info < (3,)|' \
+		-i cherrypy/test/test_static.py || die
+
+	sed -r -e '/(pytest-sugar|pytest-cov)/ d' \
+		-i setup.py || die
+
+	sed -r -e 's:--cov-report[[:space:]]+[[:graph:]]+::g' \
+		-e 's:--cov[[:graph:]]+::g' \
+		-e 's:--doctest[[:graph:]]+::g' \
+		-i pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/cherrypy/cherrypy-3.8.0.ebuild b/dev-python/cherrypy/cherrypy-3.8.0.ebuild
index c6b1b139f363..94e2448613ca 100644
--- a/dev-python/cherrypy/cherrypy-3.8.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-3.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ia64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~ia64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/cherrypy/files/cherrypy-18.5.0-tests.patch b/dev-python/cherrypy/files/cherrypy-18.5.0-tests.patch
new file mode 100644
index 000000000000..d556b8678200
--- /dev/null
+++ b/dev-python/cherrypy/files/cherrypy-18.5.0-tests.patch
@@ -0,0 +1,21 @@
+diff --git a/cherrypy/test/test_tools.py b/cherrypy/test/test_tools.py
+index 3a0fd389..e357a445 100644
+--- a/cherrypy/test/test_tools.py
++++ b/cherrypy/test/test_tools.py
+@@ -9,6 +9,8 @@ import unittest
+ import operator
+ from http.client import IncompleteRead
+ 
++import pytest
++
+ import cherrypy
+ from cherrypy import tools
+ from cherrypy._cpcompat import ntou
+@@ -343,6 +345,7 @@ class ToolTests(helper.CPWebCase):
+         expected_msg = tmpl.format(attr='items')
+         self.assertInBody(expected_msg)
+ 
++    @pytest.mark.skipif('sys.hexversion >= 0x03080000')
+     def testCombinedTools(self):
+         expectedResult = (ntou('Hello,world') +
+                           europoundUnicode).encode('utf-8')