From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1360521-garchives=archives.gentoo.org@lists.gentoo.org>
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 7FD91158087
	for <garchives@archives.gentoo.org>; Sun, 23 Jan 2022 01:38:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id B26CB2BC005;
	Sun, 23 Jan 2022 01:38:30 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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 DA1FD2BC005
	for <gentoo-commits@lists.gentoo.org>; Sun, 23 Jan 2022 01:38:29 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(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 67B3434315D
	for <gentoo-commits@lists.gentoo.org>; Sun, 23 Jan 2022 01:38:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id C9C272A3
	for <gentoo-commits@lists.gentoo.org>; Sun, 23 Jan 2022 01:38:26 +0000 (UTC)
From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org>
Message-ID: <1642901848.e6dda27fc791345327bff060058538a4f487c72f.sam@gentoo>
Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-lang/python/
X-VCS-Repository: repo/proj/prefix
X-VCS-Files: dev-lang/python/python-3.8.8_p1-r1.ebuild dev-lang/python/python-3.9.6_p1-r1.ebuild
X-VCS-Directories: dev-lang/python/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: e6dda27fc791345327bff060058538a4f487c72f
X-VCS-Branch: master
Date: Sun, 23 Jan 2022 01:38:26 +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: e0163882-2993-4119-90dd-366f0cd3f75f
X-Archives-Hash: 97b9ae22dc40088e1d7ba366d8a641a4

commit:     e6dda27fc791345327bff060058538a4f487c72f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 23 01:37:28 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 23 01:37:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e6dda27f

dev-lang/python: fix compatibility with >=setuptools-60; verify-sig

Closes: https://bugs.gentoo.org/831855
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-lang/python/python-3.8.8_p1-r1.ebuild | 5 ++++-
 dev-lang/python/python-3.9.6_p1-r1.ebuild | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev-lang/python/python-3.8.8_p1-r1.ebuild b/dev-lang/python/python-3.8.8_p1-r1.ebuild
index 1eb8bef62f..046cbbc700 100644
--- a/dev-lang/python/python-3.8.8_p1-r1.ebuild
+++ b/dev-lang/python/python-3.8.8_p1-r1.ebuild
@@ -61,7 +61,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	virtual/pkgconfig
 	sys-devel/autoconf-archive
-	verify-sig? ( app-crypt/openpgp-keys-python )
+	verify-sig? ( sec-keys/openpgp-keys-python )
 	!sys-devel/gcc[libffi(-)]"
 PDEPEND="app-eselect/eselect-python"
 RDEPEND+=" !build? ( app-misc/mime-types )"
@@ -229,6 +229,9 @@ src_compile() {
 	# Ensure sed works as expected
 	# https://bugs.gentoo.org/594768
 	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
 
 	emake CPPFLAGS= CFLAGS= LDFLAGS=
 

diff --git a/dev-lang/python/python-3.9.6_p1-r1.ebuild b/dev-lang/python/python-3.9.6_p1-r1.ebuild
index d818d00077..7885b7cfcc 100644
--- a/dev-lang/python/python-3.9.6_p1-r1.ebuild
+++ b/dev-lang/python/python-3.9.6_p1-r1.ebuild
@@ -61,7 +61,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	virtual/pkgconfig
 	sys-devel/autoconf-archive
-	verify-sig? ( app-crypt/openpgp-keys-python )
+	verify-sig? ( sec-keys/openpgp-keys-python )
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
 
@@ -236,6 +236,9 @@ src_compile() {
 	# Ensure sed works as expected
 	# https://bugs.gentoo.org/594768
 	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
 
 	emake CPPFLAGS= CFLAGS= LDFLAGS=