CVS commit: pkgsrc/devel/py-pip

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Mar  6 15:49:29 UTC 2023

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

Log Message:
py-pip: adapt patch for upstream changes

sysconfig is not imported any longer.

Reported by Gaige B Paulsen in https://github.com/TritonDataCenter/pkgsrc/issues/357

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/devel/py-pip/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/devel/py-pip/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    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.59 pkgsrc/devel/py-pip/Makefile:1.60
--- pkgsrc/devel/py-pip/Makefile:1.59   Tue Feb 21 06:31:44 2023
+++ pkgsrc/devel/py-pip/Makefile        Mon Mar  6 15:49:29 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2023/02/21 06:31:44 adam Exp $
+# $NetBSD: Makefile,v 1.60 2023/03/06 15:49:29 wiz Exp $
 
 DISTNAME=      pip-23.0.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pip/}
 

Index: pkgsrc/devel/py-pip/distinfo
diff -u pkgsrc/devel/py-pip/distinfo:1.50 pkgsrc/devel/py-pip/distinfo:1.51
--- pkgsrc/devel/py-pip/distinfo:1.50   Tue Feb 21 06:31:44 2023
+++ pkgsrc/devel/py-pip/distinfo        Mon Mar  6 15:49:29 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.50 2023/02/21 06:31:44 adam Exp $
+$NetBSD: distinfo,v 1.51 2023/03/06 15:49:29 wiz Exp $
 
 BLAKE2s (pip-23.0.1.tar.gz) = 3ae7da4091ad118cef81127aca38207876e8472c851503959d64ae7fbea84dbe
 SHA512 (pip-23.0.1.tar.gz) = f85523d44ccf81b340cc63964441e7ce4c9c0296518ec8fee742692c05b470b02263be810d2f4806bc9fc10d4fcfbeb75bfb3f1cc4509a54955804a4fbb21e1e
 Size (pip-23.0.1.tar.gz) = 2082217 bytes
-SHA1 (patch-src_pip___internal_build__env.py) = 96c0707a2d41641da5795352ba2db283b75ce6ed
+SHA1 (patch-src_pip___internal_build__env.py) = 19c6feb4b56cbdb70f9150c452dac73ca3949911

Index: pkgsrc/devel/py-pip/patches/patch-src_pip___internal_build__env.py
diff -u pkgsrc/devel/py-pip/patches/patch-src_pip___internal_build__env.py:1.5 pkgsrc/devel/py-pip/patches/patch-src_pip___internal_build__env.py:1.6
--- pkgsrc/devel/py-pip/patches/patch-src_pip___internal_build__env.py:1.5      Tue Feb 21 06:31:44 2023
+++ pkgsrc/devel/py-pip/patches/patch-src_pip___internal_build__env.py  Mon Mar  6 15:49:29 2023
@@ -1,19 +1,20 @@
-$NetBSD: patch-src_pip___internal_build__env.py,v 1.5 2023/02/21 06:31:44 adam Exp $
+$NetBSD: patch-src_pip___internal_build__env.py,v 1.6 2023/03/06 15:49:29 wiz Exp $
 
 Copy distutils distro config file to overlay.
 https://github.com/pypa/pip/issues/10949
 
 --- src/pip/_internal/build_env.py.orig        2023-02-17 18:31:10.000000000 +0000
 +++ src/pip/_internal/build_env.py
-@@ -8,6 +8,7 @@ import site
+@@ -8,6 +8,8 @@ import site
  import sys
  import textwrap
  from collections import OrderedDict
 +from shutil import copy
++from sysconfig import get_paths
  from types import TracebackType
  from typing import TYPE_CHECKING, Iterable, List, Optional, Set, Tuple, Type, Union
  
-@@ -102,6 +103,9 @@ class BuildEnvironment:
+@@ -102,6 +104,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)