CVS commit: pkgsrc/lang/python27

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Aug 22 13:01:42 UTC 2020

Modified Files:
        pkgsrc/lang/python27: distinfo
        pkgsrc/lang/python27/patches:
            patch-Lib_distutils_command_install__egg__info.py

Log Message:
We only know the build version better than python does if we're building
'Python". For all other distributions built with distutils, we sure
don't (and, mind you, it's very unlikely to be the exact same version as
Python itself). This should fix a whole bunch of py27-* packages broken
with the previous commit. Thanks wiz@ for the heads up.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/lang/python27/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/python27/patches/patch-Lib_distutils_command_install__egg__info.py

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

Modified files:

Index: pkgsrc/lang/python27/distinfo
diff -u pkgsrc/lang/python27/distinfo:1.76 pkgsrc/lang/python27/distinfo:1.77
--- pkgsrc/lang/python27/distinfo:1.76  Fri Aug 21 19:39:28 2020
+++ pkgsrc/lang/python27/distinfo       Sat Aug 22 13:01:42 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.76 2020/08/21 19:39:28 schmonz Exp $
+$NetBSD: distinfo,v 1.77 2020/08/22 13:01:42 schmonz Exp $
 
 SHA1 (Python-2.7.18.tar.xz) = 678d4cf483a1c92efd347ee8e1e79326dc82810b
 RMD160 (Python-2.7.18.tar.xz) = 40a514bb05c9e631454ea8466e28f5bb229428ad
@@ -9,7 +9,7 @@ SHA1 (patch-Include_pyport.h) = f3e4ddbc
 SHA1 (patch-Lib_ctypes_util.py) = 6fa516c7b43f08992427a0afcbe80c17bcc070f1
 SHA1 (patch-Lib_distutils_command_build__ext.py) = ea4feba4e93dbcff07050c82a00d591bb650e934
 SHA1 (patch-Lib_distutils_command_install.py) = e6aef090b444b455fe351308d251e670329b7dc3
-SHA1 (patch-Lib_distutils_command_install__egg__info.py) = 94716025231f5fb25436a4fa741e802ff284f98d
+SHA1 (patch-Lib_distutils_command_install__egg__info.py) = ec7f9e0cd04489b1f6497c44d75bff6864ad1047
 SHA1 (patch-Lib_distutils_unixccompiler.py) = db16c9aca2f29730945f28247b88b18828739bbb
 SHA1 (patch-Lib_distutils_util.py) = 5bcfad96f8e490351160f1a7c1f4ece7706a33fa
 SHA1 (patch-Lib_lib2to3_pgen2_driver.py) = 5d6dab14197f27363394ff1aeee22a8ced8026d2

Index: pkgsrc/lang/python27/patches/patch-Lib_distutils_command_install__egg__info.py
diff -u pkgsrc/lang/python27/patches/patch-Lib_distutils_command_install__egg__info.py:1.1 pkgsrc/lang/python27/patches/patch-Lib_distutils_command_install__egg__info.py:1.2
--- pkgsrc/lang/python27/patches/patch-Lib_distutils_command_install__egg__info.py:1.1  Fri Aug 21 19:39:28 2020
+++ pkgsrc/lang/python27/patches/patch-Lib_distutils_command_install__egg__info.py      Sat Aug 22 13:01:42 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-Lib_distutils_command_install__egg__info.py,v 1.1 2020/08/21 19:39:28 schmonz Exp $
+$NetBSD: patch-Lib_distutils_command_install__egg__info.py,v 1.2 2020/08/22 13:01:42 schmonz Exp $
 
 On systems where both of the conditions
 
@@ -20,14 +20,18 @@ builds on all platforms. This patch is n
 
 --- Lib/distutils/command/install_egg_info.py.orig     2020-04-19 21:13:39.000000000 +0000
 +++ Lib/distutils/command/install_egg_info.py
-@@ -21,9 +21,10 @@ class install_egg_info(Command):
+@@ -21,9 +21,13 @@ class install_egg_info(Command):
  
      def finalize_options(self):
          self.set_undefined_options('install_lib',('install_dir','install_dir'))
-+        distribution_version = "@PKGVERSION_NOREV@"
++        distribution_name = self.distribution.get_name()
++        distribution_version = self.distribution.get_version()
++        if distribution_name == "Python":
++            distribution_version = "@PKGVERSION_NOREV@"
          basename = "%s-%s-py%s.egg-info" % (
-             to_filename(safe_name(self.distribution.get_name())),
+-            to_filename(safe_name(self.distribution.get_name())),
 -            to_filename(safe_version(self.distribution.get_version())),
++            to_filename(safe_name(distribution_name)),
 +            to_filename(safe_version(distribution_version)),
              sys.version[:3]
          )