From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1159964-garchives=archives.gentoo.org@lists.gentoo.org>
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 AFF11138350
for <garchives@archives.gentoo.org>; Thu, 9 Apr 2020 02:07:17 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 80F65E0AE4;
Thu, 9 Apr 2020 02:07:15 +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 6384CE0AE4
for <gentoo-commits@lists.gentoo.org>; Thu, 9 Apr 2020 02:07:15 +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 BF92534EFEC
for <gentoo-commits@lists.gentoo.org>; Thu, 9 Apr 2020 02:07:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 70CE71C3
for <gentoo-commits@lists.gentoo.org>; Thu, 9 Apr 2020 02:07:11 +0000 (UTC)
From: "Patrick McLean" <chutzpah@gentoo.org>
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" <chutzpah@gentoo.org>
Message-ID: <1586398025.38baae9548b52b299d1f4b4f4d2772c5416725b2.chutzpah@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/importlib_metadata/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/importlib_metadata/importlib_metadata-1.6.0-r1.ebuild dev-python/importlib_metadata/importlib_metadata-1.6.0.ebuild
X-VCS-Directories: dev-python/importlib_metadata/
X-VCS-Committer: chutzpah
X-VCS-Committer-Name: Patrick McLean
X-VCS-Revision: 38baae9548b52b299d1f4b4f4d2772c5416725b2
X-VCS-Branch: master
Date: Thu, 9 Apr 2020 02:07:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 40c82982-6b33-4d49-8216-783b173b2e2e
X-Archives-Hash: 57c0f2428f30d4ff39907b4a1c3cebfd
commit: 38baae9548b52b299d1f4b4f4d2772c5416725b2
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 9 02:06:55 2020 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 02:07:05 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38baae95
dev-python/importlib_metadata-1.6.0-r1: revbump, remove setuptools_scm dep
Package-Manager: Portage-2.3.97, Repoman-2.3.22
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
...etadata-1.6.0.ebuild => importlib_metadata-1.6.0-r1.ebuild} | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.6.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.6.0-r1.ebuild
similarity index 82%
rename from dev-python/importlib_metadata/importlib_metadata-1.6.0.ebuild
rename to dev-python/importlib_metadata/importlib_metadata-1.6.0-r1.ebuild
index c28c01994c0..3ade092a2b5 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.6.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.6.0-r1.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
"
BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
test? (
${RDEPEND}
$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy3 python{2_7,3_6})
@@ -34,3 +33,12 @@ BDEPEND="
distutils_enable_sphinx "${PN}/docs" \
'>=dev-python/rst-linker-1.9'
distutils_enable_tests unittest
+
+python_prepare_all() {
+ # remove dep on setuptools_scm
+ sed -i -r "s:use_scm_version=.+,:version='${PV}',:" \
+ setup.py || die
+ sed -i -e 's:setuptools-scm::' setup.cfg || die
+
+ distutils-r1_python_prepare_all
+}