[pkgsrc/trunk]: pkgsrc/security/py-olm py-olm: fix build for python 2.7

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/41f219822e36
branches:  trunk
changeset: 372487:41f219822e36
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Jan 25 13:12:49 2022 +0000

description:
py-olm: fix build for python 2.7

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

diffstat:

 security/py-olm/Makefile               |   8 +++++++-
 security/py-olm/PLIST                  |   5 +++--
 security/py-olm/distinfo               |   3 +--
 security/py-olm/patches/patch-setup.py |  16 ----------------
 4 files changed, 11 insertions(+), 21 deletions(-)

diffs (65 lines):

diff -r cb9e68738821 -r 41f219822e36 security/py-olm/Makefile
--- a/security/py-olm/Makefile  Tue Jan 25 13:08:59 2022 +0000
+++ b/security/py-olm/Makefile  Tue Jan 25 13:12:49 2022 +0000
@@ -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 @@
 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"
diff -r cb9e68738821 -r 41f219822e36 security/py-olm/PLIST
--- a/security/py-olm/PLIST     Tue Jan 25 13:08:59 2022 +0000
+++ b/security/py-olm/PLIST     Tue Jan 25 13:12:49 2022 +0000
@@ -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
diff -r cb9e68738821 -r 41f219822e36 security/py-olm/distinfo
--- a/security/py-olm/distinfo  Tue Jan 25 13:08:59 2022 +0000
+++ b/security/py-olm/distinfo  Tue Jan 25 13:12:49 2022 +0000
@@ -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
diff -r cb9e68738821 -r 41f219822e36 security/py-olm/patches/patch-setup.py
--- a/security/py-olm/patches/patch-setup.py    Tue Jan 25 13:08:59 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2022/01/25 12:59:39 ryoon Exp $
-
-Avoid locale-based exceptions when building for Python 3.6.
-
---- setup.py.orig      2021-08-25 01:40:01.730815286 +0000
-+++ setup.py
-@@ -4,6 +4,9 @@ import os
- from codecs import open
- 
- from setuptools import setup
-+import locale
-+
-+locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
- 
- here = os.path.abspath(os.path.dirname(__file__))
-