From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D17D4138334 for ; Mon, 25 Nov 2019 08:32:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A22CE0A10; Mon, 25 Nov 2019 08:32:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8155DE0A10 for ; Mon, 25 Nov 2019 08:32:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7506D34D34C for ; Mon, 25 Nov 2019 08:32:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 961BF8C4 for ; Mon, 25 Nov 2019 08:32:45 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1574670736.0949b444806fb05d10bdd19673d525d740bef226.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/jaraco-envs/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild X-VCS-Directories: dev-python/jaraco-envs/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 0949b444806fb05d10bdd19673d525d740bef226 X-VCS-Branch: master Date: Mon, 25 Nov 2019 08:32:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e003eb8d-991c-40e5-9ce6-495bedfac504 X-Archives-Hash: b345712685cf4ce224e9c2467b68db3b commit: 0949b444806fb05d10bdd19673d525d740bef226 Author: Patrick McLean sony com> AuthorDate: Mon Nov 25 08:32:16 2019 +0000 Commit: Patrick McLean gentoo org> CommitDate: Mon Nov 25 08:32:16 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0949b444 dev-python/jaraco-envs-1.0.1: fix setuptools_scm removal Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Patrick McLean gentoo.org> dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild b/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild index 8c06fc55d5f..c325ff5c459 100644 --- a/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild +++ b/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild @@ -27,8 +27,10 @@ RESTRICT="test" S="${WORKDIR}/${MY_P}" python_prepare_all() { - # avoid a dep on setuptools_scm - sed -i "s:use_scm_version=True:version=\"${PV}\":" setup.py || die + # 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 }