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 96D09138334 for ; Mon, 25 Nov 2019 08:12:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CAA40E0A4A; Mon, 25 Nov 2019 08:12:41 +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 A8553E0A4A for ; Mon, 25 Nov 2019 08:12:41 +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 3ACDE34D235 for ; Mon, 25 Nov 2019 08:12:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FB448B5 for ; Mon, 25 Nov 2019 08:12:38 +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: <1574669515.a5a258544026c16a39ab85ad1f4ce4cfb28b34f1.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/tempora/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/tempora/tempora-1.14.1-r1.ebuild X-VCS-Directories: dev-python/tempora/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: a5a258544026c16a39ab85ad1f4ce4cfb28b34f1 X-VCS-Branch: master Date: Mon, 25 Nov 2019 08:12:38 +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: 2df58e1c-9462-4ef4-aec4-66adde64b738 X-Archives-Hash: f2c8f49ec828052c5264d3910e359f71 commit: a5a258544026c16a39ab85ad1f4ce4cfb28b34f1 Author: Patrick McLean sony com> AuthorDate: Mon Nov 25 08:11:55 2019 +0000 Commit: Patrick McLean gentoo org> CommitDate: Mon Nov 25 08:11:55 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5a25854 dev-python/tempora-1.14.1-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 gentoo.org> dev-python/tempora/tempora-1.14.1-r1.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-python/tempora/tempora-1.14.1-r1.ebuild b/dev-python/tempora/tempora-1.14.1-r1.ebuild index 411f243370d..067df96ad32 100644 --- a/dev-python/tempora/tempora-1.14.1-r1.ebuild +++ b/dev-python/tempora/tempora-1.14.1-r1.ebuild @@ -50,7 +50,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 }