python39: update to 3.9.8

macports · Nov 7, 2021 · 005f74f · 005f74f
1 parent cdd9223
commit 005f74f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 25 deletions.
diff --git a/lang/python39/Portfile b/lang/python39/Portfile
@@ -6,8 +6,7 @@ PortGroup select 1.0
 name                python39
 
 # Remember to keep py39-tkinter and py39-gdbm's versions sync'd with this
-version             3.9.7
-revision            1
+version             3.9.8
 
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          lang
@@ -24,9 +23,9 @@ master_sites        ${homepage}ftp/python/${version}/
 
 distname            Python-${version}
 use_xz              yes
-checksums           md5 fddb060b483bc01850a3f412eea1d954 \
-                    rmd160 8746b224a6be990a131543b23e881d8ab274b5e3 \
-                    sha256 f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57
+checksums           md5 d4875c1832c8f757280794f6d5e9c95f \
+                    rmd160 29bc727f06515b8b36292347142c8cbbe7368809 \
+                    sha256 675ce09bf23c09836bf1969b744b1ea4c1a18c32788626632525f08444ebad5c
 
 patchfiles          patch-setup.py.diff \
                     patch-Lib-cgi.py.diff \

diff --git a/lang/python39/files/patch-setup.py.diff b/lang/python39/files/patch-setup.py.diff
@@ -1,5 +1,5 @@
---- setup.py.orig	2021-05-04 00:54:42.000000000 +1000
-+++ setup.py	2021-05-08 04:21:52.000000000 +1000
+--- setup.py.orig	2021-11-06 06:21:41.000000000 +1100
++++ setup.py	2021-11-08 09:33:45.000000000 +1100
 @@ -44,7 +44,7 @@
  TEST_EXTENSIONS = True
 
@@ -9,7 +9,7 @@
 
 
  def get_platform():
-@@ -728,9 +728,6 @@
+@@ -731,9 +731,6 @@
          # Ensure that /usr/local is always used, but the local build
          # directories (i.e. '.' and 'Include') must be first.  See issue
          # 10520.
@@ -19,19 +19,19 @@
          # only change this for cross builds for 3.3, issues on Mageia
          if CROSS_COMPILING:
              self.add_cross_compiling_paths()
-@@ -1765,10 +1762,7 @@
-         # Build the _uuid module if possible
-         uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"])
-         if uuid_incs is not None:
--            if self.compiler.find_library_file(self.lib_dirs, 'uuid'):
--                uuid_libs = ['uuid']
+@@ -1773,10 +1770,7 @@
+         uuid_h = sysconfig.get_config_var("HAVE_UUID_H")
+         uuid_uuid_h = sysconfig.get_config_var("HAVE_UUID_UUID_H")
+         if uuid_h or uuid_uuid_h:
+-            if sysconfig.get_config_var("HAVE_LIBUUID"):
+-                uuid_libs = ["uuid"]
 -            else:
 -                uuid_libs = []
 +            uuid_libs = []
              self.add(Extension('_uuid', ['_uuidmodule.c'],
-                                libraries=uuid_libs,
-                                include_dirs=uuid_incs))
-@@ -1981,8 +1975,8 @@
+                                libraries=uuid_libs))
+         else:
+@@ -1988,8 +1982,8 @@
          # Rather than complicate the code below, detecting and building
          # AquaTk is a separate method. Only one Tkinter will be built on
          # Darwin - either AquaTk, if it is found, or X11 based Tk.

diff --git a/python/py-gdbm/Portfile b/python/py-gdbm/Portfile
@@ -136,13 +136,13 @@ subport py38-gdbm {
 }
 subport py39-gdbm {
     maintainers     {jmr @jmroot}
-    version         3.9.7
+    version         3.9.8
     revision        0
     homepage        https://docs.python.org/release/${version}/library/dbm.html
     use_xz			yes
-    checksums       md5 fddb060b483bc01850a3f412eea1d954 \
-                    rmd160 8746b224a6be990a131543b23e881d8ab274b5e3 \
-                    sha256 f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57
+    checksums       md5 d4875c1832c8f757280794f6d5e9c95f \
+                    rmd160 29bc727f06515b8b36292347142c8cbbe7368809 \
+                    sha256 675ce09bf23c09836bf1969b744b1ea4c1a18c32788626632525f08444ebad5c
     set setup_py "setup-py3k.py"
     set extract_files "Modules/_gdbmmodule.c Modules/clinic/_gdbmmodule.c.h"
     livecheck.regex {Python (3\.9\.[0-9]+)}

diff --git a/python/py-tkinter/Portfile b/python/py-tkinter/Portfile
@@ -128,13 +128,13 @@ subport py38-tkinter {
 }
 subport py39-tkinter {
     maintainers {jmr @jmroot}
-    version     3.9.7
+    version     3.9.8
     revision    0
     homepage    https://docs.python.org/release/${version}/library/tkinter.html
     use_xz      yes
-    checksums   md5 fddb060b483bc01850a3f412eea1d954 \
-                rmd160 8746b224a6be990a131543b23e881d8ab274b5e3 \
-                sha256 f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57
+    checksums   md5 d4875c1832c8f757280794f6d5e9c95f \
+                rmd160 29bc727f06515b8b36292347142c8cbbe7368809 \
+                sha256 675ce09bf23c09836bf1969b744b1ea4c1a18c32788626632525f08444ebad5c
     append extract_files " Modules/tkinter.h Modules/clinic/_tkinter.c.h"
     set module_name tkinter
 }