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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AE43515800C for ; Fri, 30 Dec 2022 17:23:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DAD12E092A; Fri, 30 Dec 2022 17:23:53 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C1836E092A for ; Fri, 30 Dec 2022 17:23:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BD6E1340DD1 for ; Fri, 30 Dec 2022 17:23:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 11B0B7F2 for ; Fri, 30 Dec 2022 17:23:51 +0000 (UTC) From: "Michał Górny" 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" Message-ID: <1672421027.a506f09bb026fd72d8cb202de079c8b314320aaf.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/setuptools/setuptools-65.6.3.ebuild X-VCS-Directories: dev-python/setuptools/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a506f09bb026fd72d8cb202de079c8b314320aaf X-VCS-Branch: master Date: Fri, 30 Dec 2022 17:23:51 +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: e1c0252e-1ee5-4a0a-bb44-0d2bf8fdd0aa X-Archives-Hash: e9d083822552190f34d7218c563b81c6 commit: a506f09bb026fd72d8cb202de079c8b314320aaf Author: Michał Górny gentoo org> AuthorDate: Fri Dec 30 15:59:17 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Dec 30 17:23:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a506f09b dev-python/setuptools: Apply user patches prior to unvendoring Signed-off-by: Michał Górny gentoo.org> dev-python/setuptools/setuptools-65.6.3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/setuptools/setuptools-65.6.3.ebuild b/dev-python/setuptools/setuptools-65.6.3.ebuild index d3dbdaf6c086..147c6b523a2f 100644 --- a/dev-python/setuptools/setuptools-65.6.3.ebuild +++ b/dev-python/setuptools/setuptools-65.6.3.ebuild @@ -79,6 +79,8 @@ src_prepare() { "${FILESDIR}"/setuptools-62.4.0-py-compile.patch ) + distutils-r1_src_prepare + # remove bundled dependencies, setuptools will switch to system deps # automatically rm -r */_vendor || die @@ -89,8 +91,6 @@ src_prepare() { -e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \ -i {} + || die - distutils-r1_src_prepare - export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} }