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=
 

Reply via email to