From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1090406-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 1ADE4138334
	for <garchives@archives.gentoo.org>; Wed, 15 May 2019 20:41:54 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 2D5ECE089F;
	Wed, 15 May 2019 20:41:53 +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 11861E08AA
	for <gentoo-commits@lists.gentoo.org>; Wed, 15 May 2019 20:41:52 +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 2F5633445B8
	for <gentoo-commits@lists.gentoo.org>; Wed, 15 May 2019 20:41:51 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 38C865EB
	for <gentoo-commits@lists.gentoo.org>; Wed, 15 May 2019 20:41:49 +0000 (UTC)
From: "Michał Górny" <mgorny@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, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1557952888.30b1286cd3dbef1821a3f4585a3bf19e78e89217.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools_scm/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
X-VCS-Directories: dev-python/setuptools_scm/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 30b1286cd3dbef1821a3f4585a3bf19e78e89217
X-VCS-Branch: master
Date: Wed, 15 May 2019 20:41:49 +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: 735f313d-c0d4-4cc0-90e2-eb41ecd8eeb7
X-Archives-Hash: 37050eeba2238bb10736f2ddf7cb3c36

commit:     30b1286cd3dbef1821a3f4585a3bf19e78e89217
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 20:40:48 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 15 20:41:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30b1286c

dev-python/setuptools_scm: Backport blocker removal to 3.2.0

Thanks to iamben for the reminder.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
index f6617c0881b..1bf03fdf621 100644
--- a/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
@@ -18,7 +18,6 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-	!!<dev-python/setuptools_scm-3
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
@@ -30,11 +29,18 @@ python_prepare_all() {
 	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
 	# all fetch specific setuptools versions
 	rm testing/test_setuptools_support.py || die
+	# remove self-dependency
+	sed -i -e "/arguments\.update/s@scm_config()@{'version': '${PV}'}@" \
+		-e "/__main__/i del sys.path[0]" setup.py || die
 
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
-	distutils_install_for_testing
+	PYTHONPATH= distutils_install_for_testing
 	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
 }
+
+python_install() {
+	PYTHONPATH= distutils-r1_python_install
+}