[gentoo-commits] repo/gentoo:master commit in: dev-python/cheroot/files/, dev-python/cheroot/

[Zac Medico]

commit:     d1ae67ce11a819a53f816ae21693522ec5c3296d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 10 17:22:51 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 17:42:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ae67ce

dev-python/cheroot: Remove old versions

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-python/cheroot/Manifest                        |  2 -
 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, 9 insertions(+), 133 deletions(-)

diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 71d038c979a..e3db8babde1 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,3 +1 @@
-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

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 1022ae4c924..00000000000
--- 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-41.4.0[${PYTHON_USEDEP}]
-	>=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 586c3328f4d..00000000000
--- 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-41.4.0[${PYTHON_USEDEP}]
-	>=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 6a80492c572..00000000000
--- 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-41.4.0[${PYTHON_USEDEP}]
-	>=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 decfdd37481..2254cb7b014 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 a5a493704cf..00000000000
--- 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
-