From: Patrick McLean Date: Mon, 25 Nov 2019 08:05:42 +0000 (-0800) Subject: dev-python/jaraco-packaging-6.2-r1: fix setuptools_scm removal X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=155d45b282c921d6a18e20787ca1f24fd4ab6591;p=gentoo.git dev-python/jaraco-packaging-6.2-r1: fix setuptools_scm removal Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Patrick McLean --- diff --git a/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild index aa458c4bbe69..e3e5f83ada4f 100644 --- a/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild +++ b/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild @@ -49,7 +49,9 @@ python_check_deps() { python_prepare_all() { # avoid a setuptools_scm dependency - sed -i "s:use_scm_version=True:version='${PV}':" setup.py || die + 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 }