CVS commit: pkgsrc/devel/py-pyutil

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Nov 30 05:41:48 UTC 2023

Modified Files:
        pkgsrc/devel/py-pyutil: Makefile PLIST distinfo
Added Files:
        pkgsrc/devel/py-pyutil/patches: patch-pyproject.toml

Log Message:
py-pyutil: fix build with newer setuptools; switch to wheel.mk; bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/py-pyutil/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-pyutil/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/py-pyutil/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/py-pyutil/patches/patch-pyproject.toml

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-pyutil/Makefile
diff -u pkgsrc/devel/py-pyutil/Makefile:1.30 pkgsrc/devel/py-pyutil/Makefile:1.31
--- pkgsrc/devel/py-pyutil/Makefile:1.30        Fri Mar  3 07:58:54 2023
+++ pkgsrc/devel/py-pyutil/Makefile     Thu Nov 30 05:41:48 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2023/03/03 07:58:54 adam Exp $
+# $NetBSD: Makefile,v 1.31 2023/11/30 05:41:48 adam Exp $
 
 DISTNAME=      pyutil-3.3.6
+PKGREVISION=   1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pyutil/}
@@ -12,15 +13,16 @@ LICENSE=    gnu-gpl-v2
 
 CONFLICTS+=    passphrase-[0-9]*
 
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-versioneer-[0-9]*:../../devel/py-versioneer
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 DEPENDS+=      ${PYPKGPREFIX}-simplejson>=2.1.0:../../converters/py-simplejson
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock>=1.3.0:../../devel/py-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-twisted>=0:../../net/py-twisted
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
 USE_LANGUAGES= # none
 
-USE_PKG_RESOURCES=     yes
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-pyutil/PLIST
diff -u pkgsrc/devel/py-pyutil/PLIST:1.6 pkgsrc/devel/py-pyutil/PLIST:1.7
--- pkgsrc/devel/py-pyutil/PLIST:1.6    Tue Feb  7 11:00:39 2023
+++ pkgsrc/devel/py-pyutil/PLIST        Thu Nov 30 05:41:48 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2023/02/07 11:00:39 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2023/11/30 05:41:48 adam Exp $
 bin/lines
 bin/passphrase
 bin/randcookie
@@ -7,13 +7,14 @@ bin/tailx
 bin/try_decoding
 bin/unsort
 bin/verinfo
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/COPYING.GPL
+${PYSITELIB}/${WHEEL_INFODIR}/COPYING.SPL.txt
+${PYSITELIB}/${WHEEL_INFODIR}/COPYING.TGPPL.rst
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/pyutil/PickleSaver.py
 ${PYSITELIB}/pyutil/PickleSaver.pyc
 ${PYSITELIB}/pyutil/PickleSaver.pyo

Index: pkgsrc/devel/py-pyutil/distinfo
diff -u pkgsrc/devel/py-pyutil/distinfo:1.12 pkgsrc/devel/py-pyutil/distinfo:1.13
--- pkgsrc/devel/py-pyutil/distinfo:1.12        Fri Mar  3 07:58:54 2023
+++ pkgsrc/devel/py-pyutil/distinfo     Thu Nov 30 05:41:48 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.12 2023/03/03 07:58:54 adam Exp $
+$NetBSD: distinfo,v 1.13 2023/11/30 05:41:48 adam Exp $
 
 BLAKE2s (pyutil-3.3.6.tar.gz) = e829ed51b9d1d39c973dc4824dddf5c4ccc8868f6b33e999360e88fd16b053cb
 SHA512 (pyutil-3.3.6.tar.gz) = 816b724e36db8822513de903161471eb5dd481781f456a77e9676b9d9e15925ffed99790acb90a2f564d4cc12dc10b9608ced24f804fb2fca8f1e081daddf2e4
 Size (pyutil-3.3.6.tar.gz) = 137461 bytes
+SHA1 (patch-pyproject.toml) = 28ba00d098e91b761d8e4147235ce2c97ed0c18a

Added files:

Index: pkgsrc/devel/py-pyutil/patches/patch-pyproject.toml
diff -u /dev/null pkgsrc/devel/py-pyutil/patches/patch-pyproject.toml:1.1
--- /dev/null   Thu Nov 30 05:41:48 2023
+++ pkgsrc/devel/py-pyutil/patches/patch-pyproject.toml Thu Nov 30 05:41:48 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-pyproject.toml,v 1.1 2023/11/30 05:41:48 adam Exp $
+
+Fix build with newer setuptools.
+
+--- pyproject.toml.orig        2023-11-30 05:37:32.780484987 +0000
++++ pyproject.toml
+@@ -4,7 +4,7 @@ authors = [
+   { name = "tpltnt", email = "tpltnt+pyutil%nkawtg.net@localhost" },
+ ]
+ description = "a collection of utilities for Python programmers"
+-dynamic = ["version"]
++dynamic = ["scripts", "version"]
+ readme = "README.rst"
+ license = { text = "GPL-2.0-or-later" }
+ requires-python = ">=2.7"