CVS commit: pkgsrc/textproc/py-tomli

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Oct 25 22:04:23 UTC 2023

Modified Files:
        pkgsrc/textproc/py-tomli: Makefile PLIST distinfo

Log Message:
py-tomli: only use flit_core and installer

This is relevant because this package is on the recommended bootstrap
path for Python distributions.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/py-tomli/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/py-tomli/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/py-tomli/distinfo

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

Modified files:

Index: pkgsrc/textproc/py-tomli/Makefile
diff -u pkgsrc/textproc/py-tomli/Makefile:1.10 pkgsrc/textproc/py-tomli/Makefile:1.11
--- pkgsrc/textproc/py-tomli/Makefile:1.10      Tue Jun  6 12:42:33 2023
+++ pkgsrc/textproc/py-tomli/Makefile   Wed Oct 25 22:04:23 2023
@@ -1,23 +1,30 @@
-# $NetBSD: Makefile,v 1.10 2023/06/06 12:42:33 riastradh Exp $
+# $NetBSD: Makefile,v 1.11 2023/10/25 22:04:23 wiz Exp $
 
 DISTNAME=      tomli-2.0.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    textproc python
-MASTER_SITES=  ${MASTER_SITE_WHEEL:=tomli/}
+MASTER_SITES=  ${MASTER_SITE_PYPI:=t/tomli/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/hukkin/tomli
 COMMENT=       Lil' TOML parser
 LICENSE=       mit
 
+TOOL_DEPENDS+= ${PYPKGPREFIX}-flit_core-[0-9]*:../../devel/py-flit_core
+TOOL_DEPENDS+= ${PYPKGPREFIX}-installer-[0-9]*:../../misc/py-installer
+
 USE_LANGUAGES= # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-# use the wheel here to avoid a circular dependency
-# py-tomli -> (py-flit_core|wheel.mk) -> py-build -> py-tomli
-NO_BUILD=              yes
-#TOOL_DEPENDS+=        ${PYPKGPREFIX}-flit_core-[0-9]*:../../devel/py-flit_core
+PY_PATCHPLIST= yes
+
+do-build:
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} -m flit_core.wheel
+
+do-install:
+       cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${PYTHONBIN} -m installer --destdir ${DESTDIR} --prefix ${PREFIX} dist/*.whl
 
-.include "../../lang/python/wheel.mk"
+.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-tomli/PLIST
diff -u pkgsrc/textproc/py-tomli/PLIST:1.2 pkgsrc/textproc/py-tomli/PLIST:1.3
--- pkgsrc/textproc/py-tomli/PLIST:1.2  Tue Jan 11 21:53:33 2022
+++ pkgsrc/textproc/py-tomli/PLIST      Wed Oct 25 22:04:23 2023
@@ -1,17 +1,18 @@
-@comment $NetBSD: PLIST,v 1.2 2022/01/11 21:53:33 nros Exp $
-${PYSITELIB}/${WHEEL_INFODIR}/INSTALLER
-${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
-${PYSITELIB}/${WHEEL_INFODIR}/METADATA
-${PYSITELIB}/${WHEEL_INFODIR}/RECORD
-${PYSITELIB}/${WHEEL_INFODIR}/REQUESTED
-${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
-${PYSITELIB}/${WHEEL_INFODIR}/direct_url.json
+@comment $NetBSD: PLIST,v 1.3 2023/10/25 22:04:23 wiz Exp $
+${PYSITELIB}/tomli-${PKGVERSION}.dist-info/LICENSE
+${PYSITELIB}/tomli-${PKGVERSION}.dist-info/METADATA
+${PYSITELIB}/tomli-${PKGVERSION}.dist-info/RECORD
+${PYSITELIB}/tomli-${PKGVERSION}.dist-info/WHEEL
 ${PYSITELIB}/tomli/__init__.py
 ${PYSITELIB}/tomli/__init__.pyc
+${PYSITELIB}/tomli/__init__.pyo
 ${PYSITELIB}/tomli/_parser.py
 ${PYSITELIB}/tomli/_parser.pyc
+${PYSITELIB}/tomli/_parser.pyo
 ${PYSITELIB}/tomli/_re.py
 ${PYSITELIB}/tomli/_re.pyc
+${PYSITELIB}/tomli/_re.pyo
 ${PYSITELIB}/tomli/_types.py
 ${PYSITELIB}/tomli/_types.pyc
+${PYSITELIB}/tomli/_types.pyo
 ${PYSITELIB}/tomli/py.typed

Index: pkgsrc/textproc/py-tomli/distinfo
diff -u pkgsrc/textproc/py-tomli/distinfo:1.4 pkgsrc/textproc/py-tomli/distinfo:1.5
--- pkgsrc/textproc/py-tomli/distinfo:1.4       Thu Mar 31 08:40:49 2022
+++ pkgsrc/textproc/py-tomli/distinfo   Wed Oct 25 22:04:23 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2022/03/31 08:40:49 adam Exp $
+$NetBSD: distinfo,v 1.5 2023/10/25 22:04:23 wiz Exp $
 
-BLAKE2s (tomli-2.0.1-py3-none-any.whl) = 11d422c7bfa378cf76fc399c2dd3a15cd3835e1ea65e8d49c03dc1e5d63b94b1
-SHA512 (tomli-2.0.1-py3-none-any.whl) = b6164b03d3db360093f92e644e87a37a0ce20d63d7e9e271fcafd727f4fdb73ad6b301aaf32b3d2839f6eedbc8ea499dafba7335b8fdfc4667e30ed50c9805b4
-Size (tomli-2.0.1-py3-none-any.whl) = 12757 bytes
+BLAKE2s (tomli-2.0.1.tar.gz) = 69c139caee13e13b12627ba996d9fb339fa39c4b809e8666796b8fc95a50280a
+SHA512 (tomli-2.0.1.tar.gz) = fd410039e255e2b3359e999d69a5a2d38b9b89b77e8557f734f2621dfbd5e1207e13aecc11589197ec22594c022f07f41b4cfe486a3a719281a595c95fd19ecf
+Size (tomli-2.0.1.tar.gz) = 15164 bytes