CVS commit: pkgsrc/security/py-olm

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jan 25 13:12:49 UTC 2022

Modified Files:
        pkgsrc/security/py-olm: Makefile PLIST distinfo
Removed Files:
        pkgsrc/security/py-olm/patches: patch-setup.py

Log Message:
py-olm: fix build for python 2.7

Also remove python 3.6 patch; that python version is not in pkgsrc
any longer.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/py-olm/Makefile \
    pkgsrc/security/py-olm/PLIST pkgsrc/security/py-olm/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/security/py-olm/patches/patch-setup.py

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.1 pkgsrc/security/py-olm/Makefile:1.2
--- pkgsrc/security/py-olm/Makefile:1.1 Tue Jan 25 12:59:39 2022
+++ pkgsrc/security/py-olm/Makefile     Tue Jan 25 13:12:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2022/01/25 12:59:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2022/01/25 13:12:49 wiz Exp $
 
 DISTNAME=      olm-3.2.10
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -15,6 +15,12 @@ WRKSRC=              ${WRKDIR}/${DISTNAME}/python
 DEPENDS+=      ${PYPKGPREFIX}-future>=0.18.2:../../devel/py-future
 DEPENDS+=      ${PYPKGPREFIX}-cffi>=1.0.0:../../devel/py-cffi
 
+.include "../../lang/python/pyversion.mk"
+
+.if ${PYPKGPREFIX} == "py27"
+DEPENDS+=      ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing
+.endif
+
 .include "../../security/olm/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/security/py-olm/PLIST
diff -u pkgsrc/security/py-olm/PLIST:1.1 pkgsrc/security/py-olm/PLIST:1.2
--- pkgsrc/security/py-olm/PLIST:1.1    Tue Jan 25 12:59:39 2022
+++ pkgsrc/security/py-olm/PLIST        Tue Jan 25 13:12:49 2022
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2022/01/25 12:59:39 ryoon Exp $
-${PYSITELIB}/_libolm.abi3.so
+@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
 ${PYSITELIB}/olm/__init__.py
 ${PYSITELIB}/olm/__init__.pyc
 ${PYSITELIB}/olm/__init__.pyo
Index: pkgsrc/security/py-olm/distinfo
diff -u pkgsrc/security/py-olm/distinfo:1.1 pkgsrc/security/py-olm/distinfo:1.2
--- pkgsrc/security/py-olm/distinfo:1.1 Tue Jan 25 12:59:39 2022
+++ pkgsrc/security/py-olm/distinfo     Tue Jan 25 13:12:49 2022
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1 2022/01/25 12:59:39 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2022/01/25 13:12:49 wiz Exp $
 
 BLAKE2s (olm-3.2.10.tar.gz) = 888b76d7543eca0316cc447232836e3a2ce7e0acebf63a1ad7944c4893805e26
 SHA512 (olm-3.2.10.tar.gz) = e4b4e1a4b5afbf537780db21a7639609581f9be7f52d8bec572db38e9e2bae43138c1214aa23a87fb5c66f3ce47f566950c9689b27426ea894afa444fc3829c7
 Size (olm-3.2.10.tar.gz) = 2894343 bytes
-SHA1 (patch-setup.py) = 3ee82830e1bf0a69b455d68efc49e67b6215aada