From 71deace00d1a2b091313fe137ab7092418c6f87c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Feb 2020 21:05:55 +0000 Subject: gentoo resync : 10.02.2020 --- dev-python/cheroot/Manifest | 8 +--- dev-python/cheroot/cheroot-6.0.0-r1.ebuild | 32 ------------- dev-python/cheroot/cheroot-6.0.0.ebuild | 32 ------------- dev-python/cheroot/cheroot-6.5.4.ebuild | 53 ---------------------- dev-python/cheroot/cheroot-8.2.1.ebuild | 13 ++++-- .../cheroot/files/6.5.4-fix-requirements.patch | 10 ---- 6 files changed, 10 insertions(+), 138 deletions(-) delete mode 100644 dev-python/cheroot/cheroot-6.0.0-r1.ebuild delete mode 100644 dev-python/cheroot/cheroot-6.0.0.ebuild delete mode 100644 dev-python/cheroot/cheroot-6.5.4.ebuild delete mode 100644 dev-python/cheroot/files/6.5.4-fix-requirements.patch (limited to 'dev-python/cheroot') diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest index 1b518524846a..2151d3d56fa0 100644 --- a/dev-python/cheroot/Manifest +++ b/dev-python/cheroot/Manifest @@ -1,9 +1,3 @@ -AUX 6.5.4-fix-requirements.patch 272 BLAKE2B 9694f577198f94ee1634468750f4ca8a1d66014fd8f3a65719d53bd27d99855a76478a5946e4a5c9f3515ad39be28bd12829f7672e83c7b887740ae0dd2e6418 SHA512 de0d3be2d062cb6a3088eb4e75f0ea97f57c81ee2d207acfb28780a757adddcd4e1e718ff6afe27cf98981db5d8347186ba74bd89a940f8b7ac406429a4759ad -DIST cheroot-6.0.0.tar.gz 62763 BLAKE2B 0946c01c6a6233dc60ca3dd896c3d1dbc0feb97d5099d88598db340a8812b2be4cb076383c0e39d30cd2c6fd3402e048b716a02e82bec8ce08d5b8fca4b1be0f SHA512 0109fbf3b73ed3f12261eaa3c6d86b6c6b80a1ba3564548ba3288aa6c61a1c08db60886e677991bf7997e6a5b1ec7767a3e06098ec1748453e72c40fda7b82a7 -DIST cheroot-6.5.4.tar.gz 81067 BLAKE2B 5304373bb8c7cefa341260d4fdb8a99b9e22041260342a716a6b95ba324b4f31d20fb44d8dc10840fb35d3b04de1283deb9aca11bc78772655bf7ad81cf16f3c SHA512 62a48ced225bf9167259b82f5e88a953bdc422982a6c0b0121b28e895cc8347cc033f573b57a048c59167586e0b21e94ad233ce2b65a1b72feb01db82b5ed411 DIST cheroot-8.2.1.tar.gz 89470 BLAKE2B 57515ecf6e047ea67599631a98c15307ea5f9929b398a8143bc157bfe71129b11a1f4bc841f586f98167ac4c6c9680d476bd167323e5828163b4bff9bf24c360 SHA512 3f6b55c6b2403569eedb1fe7b473d3a65ad5d06cb99a38370316db38b6138b1a6921c6b7d8ba64424c5b8c20c9c58ada33da7cb8ebb6f313610f63c1f364f862 -EBUILD cheroot-6.0.0-r1.ebuild 943 BLAKE2B 1e84889e62f4efb283ef2c4abe3a2f0a9d3e7464c30e5cc72c57db284a342475bfcd8cefe550dd2d95c3cd1ea71caab9798c291ded24d32c9357b4cfc4b5d35a SHA512 23b327c91237de42cbbedec267e92daa21db8859c3ada6b2b43ce1b6d3250e05f84a363b67b5b9c26ab1150c451659042433dc8cf6bad258ea3dbaea8f9f2d38 -EBUILD cheroot-6.0.0.ebuild 939 BLAKE2B 203f682d77983b1ec4e35ea8b0fe338e477857251e0d41a4ec527f807aaff4688febf7204e277661bb5905392b7d7494c2e8e8311c1a32b538eeb818e8557de0 SHA512 5f27f8e812d13e3e4f53a2f46631d2a3925a9377f5998e4583b9d60074b4a4e6513083274fae2c11313bbaf6da5e2ba9e361a293be7925a147ee1b1573f0a783 -EBUILD cheroot-6.5.4.ebuild 1745 BLAKE2B 1ca8732f9e3c79bae1190cf9c04a777e9881608558b4a040ea0f58c12165dc32d1c86138aa2b83eeb2b8fa496460284c4aaebcad8d459169f9eb85d9304e4f75 SHA512 f5dfd7fd14360e6d1ad5ac5058c3aa4003a803cdfc19370617e14090255797ee646300bf2121a32bb7f1f981b08368842e13b7c48d3755915938d2f43d62699d -EBUILD cheroot-8.2.1.ebuild 1676 BLAKE2B 755512ff087835b6b6439fd0e928b3c8adf9d20a9a11e32c95d6d72af595e426417d5707fb26edf0388e72205461d54f3031e249de1b7ad72a746b8b43b3ff1d SHA512 65b07359f0e3d9724669b9898f5016c3602922b68b4b258854f4d2c9d0ce01b20968edaf49c9730a0478993a54aa96737a22c0a029342398069b10e13ab2fd55 +EBUILD cheroot-8.2.1.ebuild 1757 BLAKE2B 9e25ffeca160774f857f393cc8d31f44fb043044513dd3ad12087110446fe52e89544fdb13a70988219e0d7defd6726da05702fb668979a432b8e9c955162b7b SHA512 4f85326044aa875dabf690395d86013718441b1fae9274c6799ea5208b34c4c25f2b785ac71f691382d3eae52f632478e0f5758b83dbecb0daaeccd6192a342f MISC metadata.xml 370 BLAKE2B df7ec3eb606f1557e048245eca81402f40f9cd9bc4ec8112ecb0085f65530d9a66b952d56f826b2b97733018ec4b4d31c16ac26bebd3a40f3424421255fcb770 SHA512 22ff00c4677bd898e9d88f2bdebabed6a145a9dd33d6276e997c0435c64fc9dfd396a35a88c6facc8a3844187f0b598bfe8606637ea88420a6c33e1ea9765cbf diff --git a/dev-python/cheroot/cheroot-6.0.0-r1.ebuild b/dev-python/cheroot/cheroot-6.0.0-r1.ebuild deleted file mode 100644 index 1022ae4c9243..000000000000 --- a/dev-python/cheroot/cheroot-6.0.0-r1.ebuild +++ /dev/null @@ -1,32 +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 ~ia64 ~ppc ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}] - >=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - =dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}] - test? ( - dev-python/portend[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-cov[${PYTHON_USEDEP}] - )" - -python_test() { - py.test -v || die "tests failed under ${EPTYHON}" -} diff --git a/dev-python/cheroot/cheroot-6.0.0.ebuild b/dev-python/cheroot/cheroot-6.0.0.ebuild deleted file mode 100644 index 586c3328f4d9..000000000000 --- a/dev-python/cheroot/cheroot-6.0.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 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 ~ia64 ~ppc ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}] - >=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - =dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}] - test? ( - dev-python/portend[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-cov[${PYTHON_USEDEP}] - )" - -python_test() { - py.test -v || die "tests failed under ${EPTYHON}" -} diff --git a/dev-python/cheroot/cheroot-6.5.4.ebuild b/dev-python/cheroot/cheroot-6.5.4.ebuild deleted file mode 100644 index 6a80492c572d..000000000000 --- a/dev-python/cheroot/cheroot-6.5.4.ebuild +++ /dev/null @@ -1,53 +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 ~arm64" -# 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}]" -DEPEND="${RDEPEND} - =dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}] - >=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]" - - # Add the following for unit tests, some packages listed will need - # to be added and keyworded appropriately. -# test? ( -# dev-python/ddt[${PYTHON_USEDEP}] -# dev-python/pytest[${PYTHON_USEDEP}] -# dev-python/pytest-mock[${PYTHON_USEDEP}] -# dev-python/pytest-sugar[${PYTHON_USEDEP}] -# dev-python/pytest-testmon[${PYTHON_USEDEP}] -# dev-python/pytest-watch[${PYTHON_USEDEP}] -# dev-python/pytest-xdist[${PYTHON_USEDEP}] -# dev-python/coverage[${PYTHON_USEDEP}] -# dev-python/codecov[${PYTHON_USEDEP}] -# dev-python/pytest-cov[${PYTHON_USEDEP}] -# dev-python/trustme[${PYTHON_USEDEP}] -# dev-python/pyopenssl[${PYTHON_USEDEP}] -# dev-python/requests-unixsocket[${PYTHON_USEDEP}] -# )" - -PATCHES=( - # https://github.com/CherryPy/cheroot/issues/181 - "${FILESDIR}"/6.5.4-fix-requirements.patch -) - -# python_test() { -# py.test -v || die "tests failed under ${EPYTHON}" -# } diff --git a/dev-python/cheroot/cheroot-8.2.1.ebuild b/dev-python/cheroot/cheroot-8.2.1.ebuild index decfdd37481d..2254cb7b0145 100644 --- a/dev-python/cheroot/cheroot-8.2.1.ebuild +++ b/dev-python/cheroot/cheroot-8.2.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64" +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" @@ -21,9 +21,7 @@ RESTRICT="test" RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}] >=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}] - >=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]" + dev-python/setuptools[${PYTHON_USEDEP}]" # Add the following for unit tests, some packages listed will need # to be added and keyworded appropriately. @@ -45,3 +43,10 @@ DEPEND="${RDEPEND} #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/files/6.5.4-fix-requirements.patch b/dev-python/cheroot/files/6.5.4-fix-requirements.patch deleted file mode 100644 index a5a493704cfa..000000000000 --- a/dev-python/cheroot/files/6.5.4-fix-requirements.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/setup.cfg 2019-03-09 17:14:40.127863655 -0600 -+++ b/setup.cfg 2019-03-09 17:15:22.135345396 -0600 -@@ -57,7 +57,6 @@ - setuptools_scm>=1.15.0 - setuptools_scm_git_archive>=1.0 - install_requires = -- backports.functools_lru_cache - six>=1.11.0 - more_itertools>=2.6 - -- cgit v1.2.3