CVS commit: pkgsrc/devel/py-daemon

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jul 25 12:29:55 UTC 2024

Modified Files:
        pkgsrc/devel/py-daemon: Makefile distinfo
Added Files:
        pkgsrc/devel/py-daemon/patches: patch-version.py

Log Message:
py-daemon: fix build with latest setuptools


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/py-daemon/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/py-daemon/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/py-daemon/patches/patch-version.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-daemon/Makefile
diff -u pkgsrc/devel/py-daemon/Makefile:1.29 pkgsrc/devel/py-daemon/Makefile:1.30
--- pkgsrc/devel/py-daemon/Makefile:1.29        Fri Jan 12 14:26:59 2024
+++ pkgsrc/devel/py-daemon/Makefile     Thu Jul 25 12:29:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2024/01/12 14:26:59 adam Exp $
+# $NetBSD: Makefile,v 1.30 2024/07/25 12:29:55 wiz Exp $
 
 DISTNAME=      python-daemon-3.0.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/python-//}
@@ -10,6 +10,8 @@ HOMEPAGE=     https://pagure.io/python-daemo
 COMMENT=       Library to implement a well-behaved Unix daemon process
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 DEPENDS+=      ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
 DEPENDS+=      ${PYPKGPREFIX}-lockfile>=0.10:../../devel/py-lockfile

Index: pkgsrc/devel/py-daemon/distinfo
diff -u pkgsrc/devel/py-daemon/distinfo:1.13 pkgsrc/devel/py-daemon/distinfo:1.14
--- pkgsrc/devel/py-daemon/distinfo:1.13        Fri Jan 12 14:26:59 2024
+++ pkgsrc/devel/py-daemon/distinfo     Thu Jul 25 12:29:55 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.13 2024/01/12 14:26:59 adam Exp $
+$NetBSD: distinfo,v 1.14 2024/07/25 12:29:55 wiz Exp $
 
 BLAKE2s (python-daemon-3.0.1.tar.gz) = d08e0c78df38e095c3560de18d46aad436df9a647cf8933b09d551e2eb3d5687
 SHA512 (python-daemon-3.0.1.tar.gz) = ea35ec3e930e533ef08a492aa36492a958c9258857cdc75ab2ddb6688a7d8990282cfa0f63ee5cb6b7036b9cb71be03631d5d0d58788a08052425a441bce4e9a
 Size (python-daemon-3.0.1.tar.gz) = 81337 bytes
+SHA1 (patch-version.py) = 7f00b9c0735e98c95e3b1ebbb6086b5e9f348ceb

Added files:

Index: pkgsrc/devel/py-daemon/patches/patch-version.py
diff -u /dev/null pkgsrc/devel/py-daemon/patches/patch-version.py:1.1
--- /dev/null   Thu Jul 25 12:29:55 2024
+++ pkgsrc/devel/py-daemon/patches/patch-version.py     Thu Jul 25 12:29:55 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-version.py,v 1.1 2024/07/25 12:29:55 wiz Exp $
+
+Setuptools >= 0.70 compatibility.
+
+--- version.py.orig    2024-07-25 12:25:17.449208258 +0000
++++ version.py
+@@ -36,7 +36,7 @@ import setuptools.command.build
+ import setuptools.command.build_py
+ import setuptools.command.egg_info
+ import setuptools.dist
+-import setuptools.extern.packaging.version
++import packaging.version
+ 
+ 
+ def ensure_class_bases_begin_with(namespace, class_name, base_class):
+@@ -186,7 +186,7 @@ class ChangeLogEntry:
+             # A valid non-version value.
+             return None
+ 
+-        valid_version = setuptools.extern.packaging.version.Version(value)
++        valid_version = packaging.version.Version(value)
+ 
+     @classmethod
+     def validate_maintainer(cls, value):