CVS commit: pkgsrc/devel/py-pip

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Mar 15 21:22:59 UTC 2022

Modified Files:
        pkgsrc/devel/py-pip: Makefile distinfo
Added Files:
        pkgsrc/devel/py-pip/patches: patch-src_pip___internal_build__env.py

Log Message:
py-pip: copy distro config file to overlay directory

Fixes pip with overlay support.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/devel/py-pip/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/devel/py-pip/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-pip/patches/patch-src_pip___internal_build__env.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-pip/Makefile
diff -u pkgsrc/devel/py-pip/Makefile:1.51 pkgsrc/devel/py-pip/Makefile:1.52
--- pkgsrc/devel/py-pip/Makefile:1.51   Wed Jan  5 15:41:07 2022
+++ pkgsrc/devel/py-pip/Makefile        Tue Mar 15 21:22:59 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2022/01/05 15:41:07 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2022/03/15 21:22:59 wiz Exp $
 
 DISTNAME=      pip-21.3.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pip/}
 

Index: pkgsrc/devel/py-pip/distinfo
diff -u pkgsrc/devel/py-pip/distinfo:1.43 pkgsrc/devel/py-pip/distinfo:1.44
--- pkgsrc/devel/py-pip/distinfo:1.43   Tue Nov  9 23:19:49 2021
+++ pkgsrc/devel/py-pip/distinfo        Tue Mar 15 21:22:59 2022
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.43 2021/11/09 23:19:49 wiz Exp $
+$NetBSD: distinfo,v 1.44 2022/03/15 21:22:59 wiz Exp $
 
 BLAKE2s (pip-21.3.1.tar.gz) = ef20009a7f7d9131debfb4b33f3438d4ca2f9a9f90c72d28b3c1bdcb6967cdf9
 SHA512 (pip-21.3.1.tar.gz) = cc8cb13a7f4f53ddcaa1bf10586d0caa51bc334728bbd664f7085b3bfbfd09d082c2f01f4d1ecd6a69d7228976058a965087f1852da6d1155526fac1f107bf13
 Size (pip-21.3.1.tar.gz) = 1731517 bytes
+SHA1 (patch-src_pip___internal_build__env.py) = bcf27c9cd169c487dd266f3747dc1ede4845e9c0

Added files:

Index: pkgsrc/devel/py-pip/patches/patch-src_pip___internal_build__env.py
diff -u /dev/null pkgsrc/devel/py-pip/patches/patch-src_pip___internal_build__env.py:1.1
--- /dev/null   Tue Mar 15 21:22:59 2022
+++ pkgsrc/devel/py-pip/patches/patch-src_pip___internal_build__env.py  Tue Mar 15 21:22:59 2022
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_pip___internal_build__env.py,v 1.1 2022/03/15 21:22:59 wiz Exp $
+
+Copy distutils distro config file to overlay.
+https://github.com/pypa/pip/issues/10949
+
+--- src/pip/_internal/build_env.py.orig        2021-10-22 15:15:54.000000000 +0000
++++ src/pip/_internal/build_env.py
+@@ -9,6 +9,7 @@ import sys
+ import textwrap
+ import zipfile
+ from collections import OrderedDict
++from shutil import copy
+ from sysconfig import get_paths
+ from types import TracebackType
+ from typing import TYPE_CHECKING, Iterable, Iterator, List, Optional, Set, Tuple, Type
+@@ -93,6 +94,9 @@ class BuildEnvironment:
+         self._site_dir = os.path.join(temp_dir.path, "site")
+         if not os.path.exists(self._site_dir):
+             os.mkdir(self._site_dir)
++        distutils_distro_config = get_paths()["platlib"] + "/_distutils_system_mod.py"
++        if os.path.exists(distutils_distro_config):
++            copy(distutils_distro_config, self._site_dir)
+         with open(os.path.join(self._site_dir, "sitecustomize.py"), "w") as fp:
+             fp.write(
+                 textwrap.dedent(