CVS commit: pkgsrc/security/py-olm

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Nov  5 13:25:14 UTC 2023

Modified Files:
        pkgsrc/security/py-olm: Makefile PLIST

Log Message:
py-olm: convert to wheel.mk

Not for Python 2.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/py-olm/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/py-olm/PLIST

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

Modified files:

Index: pkgsrc/security/py-olm/Makefile
diff -u pkgsrc/security/py-olm/Makefile:1.3 pkgsrc/security/py-olm/Makefile:1.4
--- pkgsrc/security/py-olm/Makefile:1.3 Wed Mar 29 09:04:03 2023
+++ pkgsrc/security/py-olm/Makefile     Sun Nov  5 13:25:14 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2023/03/29 09:04:03 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2023/11/05 13:25:14 wiz Exp $
 
 DISTNAME=      olm-3.2.10
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    security python
 MASTER_SITES=  https://gitlab.matrix.org/matrix-org/olm/-/archive/${PKGVERSION_NOREV}/
 
@@ -10,17 +11,14 @@ HOMEPAGE=   https://gitlab.matrix.org/matr
 COMMENT=       Olm bindings for Python
 LICENSE=       apache-2.0
 
-WRKSRC=                ${WRKDIR}/${DISTNAME}/python
-
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
 DEPENDS+=      ${PYPKGPREFIX}-future>=0.18.2:../../devel/py-future
 DEPENDS+=      ${PYPKGPREFIX}-cffi>=1.0.0:../../devel/py-cffi
 
-.include "../../lang/python/pyversion.mk"
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-.if ${PYTHON_VERSION} == 207
-DEPENDS+=      ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing
-.endif
+WRKSRC=                ${WRKDIR}/${DISTNAME}/python
 
 .include "../../security/olm/buildlink3.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-olm/PLIST
diff -u pkgsrc/security/py-olm/PLIST:1.2 pkgsrc/security/py-olm/PLIST:1.3
--- pkgsrc/security/py-olm/PLIST:1.2    Tue Jan 25 13:12:49 2022
+++ pkgsrc/security/py-olm/PLIST        Sun Nov  5 13:25:14 2023
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2022/01/25 13:12:49 wiz Exp $
-${PLIST.py2x}${PYSITELIB}/_libolm.so
-${PLIST.py3x}${PYSITELIB}/_libolm.abi3.so
+@comment $NetBSD: PLIST,v 1.3 2023/11/05 13:25:14 wiz Exp $
+${PYSITELIB}/_libolm.abi3.so
 ${PYSITELIB}/olm/__init__.py
 ${PYSITELIB}/olm/__init__.pyc
 ${PYSITELIB}/olm/__init__.pyo
@@ -31,9 +30,7 @@ ${PYSITELIB}/olm/session.pyo
 ${PYSITELIB}/olm/utility.py
 ${PYSITELIB}/olm/utility.pyc
 ${PYSITELIB}/olm/utility.pyo
-${PYSITELIB}/python_${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/python_${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/python_${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/python_${EGG_INFODIR}/not-zip-safe
-${PYSITELIB}/python_${EGG_INFODIR}/requires.txt
-${PYSITELIB}/python_${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/python_${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/python_${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/python_${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/python_${WHEEL_INFODIR}/top_level.txt