Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/jaraco-packaging/
Date: Mon, 25 Nov 2019 08:09:59
Message-Id: 1574669142.155d45b282c921d6a18e20787ca1f24fd4ab6591.chutzpah@gentoo
1 commit: 155d45b282c921d6a18e20787ca1f24fd4ab6591
2 Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
3 AuthorDate: Mon Nov 25 08:05:42 2019 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 25 08:05:42 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=155d45b2
7
8 dev-python/jaraco-packaging-6.2-r1: fix setuptools_scm removal
9
10 Copyright: Sony Interactive Entertainment Inc.
11 Package-Manager: Portage-2.3.79, Repoman-2.3.18
12 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
13
14 dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild | 4 +++-
15 1 file changed, 3 insertions(+), 1 deletion(-)
16
17 diff --git a/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild
18 index aa458c4bbe6..e3e5f83ada4 100644
19 --- a/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild
20 +++ b/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild
21 @@ -49,7 +49,9 @@ python_check_deps() {
22
23 python_prepare_all() {
24 # avoid a setuptools_scm dependency
25 - sed -i "s:use_scm_version=True:version='${PV}':" setup.py || die
26 + sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
27 + sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \
28 + setup.cfg || die
29
30 distutils-r1_python_prepare_all
31 }