[gentoo-commits] repo/gentoo:master commit in: dev-python/jaraco-envs/

["Michał Górny" <mgorny@gentoo.org>]

commit:     b0c07dd967c395afaeb0b57db20a7b67dbd92074
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 27 10:59:58 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 27 11:00:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0c07dd9

dev-python/jaraco-envs: Remove broken setuptools_scm removal

Closes: https://bugs.gentoo.org/725582
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/jaraco-envs/Manifest                 |  2 +-
 dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/dev-python/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index 1d40f9f51cd..f46669ff8fc 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,2 +1,2 @@
 DIST jaraco-envs-1.0.1.tar.gz 8133 BLAKE2B 05ec6b0ea7532dcf6efe32fe7d1d6a1346d60294ed09743a6f7a47599406bb798f1250525b241aa24b971849f485f89440a56e8ca6b94b2f6847c48aab281be8 SHA512 df5aa3fe06be5091745697cb5f9dda6110fa60e1330515dddbb3e8441eb2232ba1036cfaef7ac8f054958c1a890601330b04b81a0887c4ebc6b41f29335df76b
-DIST jaraco-envs-2.0.0.tar.gz 8889 BLAKE2B 33635b4eae84dd01c7ca6f41ca38b73cc10f0c131788481349019e11e3a0fdf20039574fa99678fc9f8cbe0082c817997e944bf3299fed05b0ca4a68a24e2ec2 SHA512 a834f72ae5b3e0633f1d794a28914e653807ba27a9184724a651ed8ee7d8d0541fef6d5888a47ac53f386dcd8b701d305ae68ddcf56bec5992e49272a641ea38
+DIST jaraco.envs-2.0.0.tar.gz 10018 BLAKE2B 8ad47fb7cb8f68081bba0e83368fe3a2f069130153b78be375a7a4543cf85e00ca1e365f9fb5a76d54f771879e87ff4737fe2991a9c520a9f86f21cf5d9aa8ce SHA512 f121c25ecce75beece7ed7218e69616f7cec6e493f9734b8ce040368d0fedc1ca4d7d343ba41c1367451a744f28ed98d9d2f3abc4610bfa8709fc29480c5ccbd

diff --git a/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
index 9a758d448e6..3d3446b9761 100644
--- a/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
@@ -10,7 +10,8 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Classes for orchestrating Python (virtual) environments."
 HOMEPAGE="https://github.com/jaraco/jaraco.envs"
-SRC_URI="https://github.com/jaraco/jaraco.envs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_P::1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
@@ -19,22 +20,13 @@ KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~sparc ~x86"
 RDEPEND="dev-python/namespace-jaraco[${PYTHON_USEDEP}]
 	dev-python/path-py[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' 'python3_[67]')"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
 # there are no actual tests, just flake8 etc
 RESTRICT="test"
 
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# avoid a setuptools_scm dependency
-	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
-	sed -r -i "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
-		setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
 python_install() {
 	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
 	distutils-r1_python_install --skip-build