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 9B445138334 for ; Mon, 25 Nov 2019 08:09:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6403E09CD; Mon, 25 Nov 2019 08:09:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B986AE09CD for ; Mon, 25 Nov 2019 08:09:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 8905034D330 for ; Mon, 25 Nov 2019 08:09:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 11B078B5 for ; Mon, 25 Nov 2019 08:09:56 +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: <1574669142.155d45b282c921d6a18e20787ca1f24fd4ab6591.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/jaraco-packaging/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild X-VCS-Directories: dev-python/jaraco-packaging/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 155d45b282c921d6a18e20787ca1f24fd4ab6591 X-VCS-Branch: master Date: Mon, 25 Nov 2019 08:09:56 +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: 348e50d3-f470-4ef5-a783-0b32a7da3b25 X-Archives-Hash: 7c3a01bc0b6cc63d82d2e202ed154a94 commit: 155d45b282c921d6a18e20787ca1f24fd4ab6591 Author: Patrick McLean sony com> AuthorDate: Mon Nov 25 08:05:42 2019 +0000 Commit: Patrick McLean gentoo org> CommitDate: Mon Nov 25 08:05:42 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=155d45b2 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 gentoo.org> dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 aa458c4bbe6..e3e5f83ada4 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 }