gentoo resync : 11.08.2021

3 files changed, 2 insertions, 67 deletions

diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index a3536d6a1aaf..66d9806d40d0 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,5 +1,3 @@
-DIST CherryPy-18.6.0.tar.gz 686804 BLAKE2B dae7f0ac403084acdf611e4a9e75f152355491e4383a1bd1374ae77ac68b415f41ce79f1e65a7a66c61aa0965ac94cd9bfd0d425cf7752ab54edf0bc0d8cabfb SHA512 cd33303fa9b9704ef427553091a6a6c2bbfea20e7d81acd2bcdc2855f8a36a084a0781bb19f3a084b24f0664bd7b318a667c8c79b5073381901acce4602de9d7
 DIST CherryPy-18.6.1.tar.gz 692730 BLAKE2B 44cef7ed54a090df396691001b794bf13be2c61003bf80b63223e3a42914ce50fcfe43c06626fb881105e3ed6fbf587df7024bbf7cfde00a8263c432f4cc7ae4 SHA512 186a0992a443e1ffc1a2924b3351dcb0e6cc6c88b39ac32330d6365fe1b0a35c2008a3a18e1a57f61ffd1901ea6134333bb6288024d8ffbb1fd8e8dcd3145007
-EBUILD cherrypy-18.6.0.ebuild 1914 BLAKE2B b62d45faf44139a435f12517f106f087110d7c083c8dc5b785c56c4f6999e5f3a22caec70f7d9a15654b6b98041020e5ca1c54546a16afabaaf53e9cd831bfdc SHA512 92416bb5498faa86190b85fd110ce5d87909894c57b5a37038cbb1316ab961fe1de2807bcc30f658da77e4aafede558d38f1667cdd22aad0c14a0f604f674568
-EBUILD cherrypy-18.6.1.ebuild 1392 BLAKE2B 4dc80d0d35303e3e55e9b2159e61c17b013ac6ef74855ad7612cd2f42497f12fb28a6c42130c4a1472bd4b458836795ca73bdf9e271d7e29ee8a66c878268e0d SHA512 afee7a4995ae794a4417db9d74c6140b6e30f4cf51a4e3c98c2389b24b9bf27568e1b7c7ea5a893708f4e0db84550dd09672b766f9041b3f50b29f5195a5d1e2
+EBUILD cherrypy-18.6.1.ebuild 1387 BLAKE2B 7213aaacbd30ca80ad475e047df5660ceab6ac9aa1e15a555fe3ac22be1719d09c1052877e3eefd1e79b752bc10bb33d6eea6801773920e645d02a5fbf106dfe SHA512 ead14c542bfc23d5cbd745e3ae01906b680e2e3cdafbbee4b5fab770185e88c778961cc54b095000584373db096f53d2a49eeba99a26d6523c43cb772970dcb2
 MISC metadata.xml 346 BLAKE2B 96afee16daef8fd731513c0119b1a58225caac3a1a9550d53ac83fc79c286cbe7bf3025f37cf1ce9af8881a8a99d98141051c3130e8af93822fd79671016352d SHA512 4cf59edd86b71c5aee0863e5437fc0fdc5a37d1001b8ba87e3245444986884c4b804ed8686117f277bf6e90b310044d9b51bb3cf5271ab6db7b70a7e71e47518
diff --git a/dev-python/cherrypy/cherrypy-18.6.0.ebuild b/dev-python/cherrypy/cherrypy-18.6.0.ebuild
deleted file mode 100644
index 851f63ba2025..000000000000
--- a/dev-python/cherrypy/cherrypy-18.6.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-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 arm arm64 ~ia64 ppc ~ppc64 x86"
-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="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/routes[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/objgraph[${PYTHON_USEDEP}]
-		dev-python/path-py[${PYTHON_USEDEP}]
-		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-		dev-python/pytest-services[${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
-
-	# fragile, fails with newer versions of CPython
-	sed -e 's:testCombinedTools:_&:' \
-		-i cherrypy/test/test_tools.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-18.6.1.ebuild b/dev-python/cherrypy/cherrypy-18.6.1.ebuild
index 25be2b216f72..f737a38a7917 100644
--- a/dev-python/cherrypy/cherrypy-18.6.1.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.6.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 IUSE="ssl test"
 
 RDEPEND="