CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jan 26 07:19:03 UTC 2022

Modified Files:
        pkgsrc/chat/matrix-synapse: Makefile
        pkgsrc/security/py-signedjson: Makefile

Log Message:
*: propagate py-unpaddedbase64's python 3.x restriction


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/chat/matrix-synapse/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/py-signedjson/Makefile

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

Modified files:

Index: pkgsrc/chat/matrix-synapse/Makefile
diff -u pkgsrc/chat/matrix-synapse/Makefile:1.39 pkgsrc/chat/matrix-synapse/Makefile:1.40
--- pkgsrc/chat/matrix-synapse/Makefile:1.39    Wed Jan  5 15:40:57 2022
+++ pkgsrc/chat/matrix-synapse/Makefile Wed Jan 26 07:19:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2022/01/05 15:40:57 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2022/01/26 07:19:03 wiz Exp $
 
 DISTNAME=      matrix-synapse-1.48.0
 PKGREVISION=   2
@@ -42,8 +42,9 @@ DEPENDS+=     ${PYPKGPREFIX}-typing-extensio
 DEPENDS+=      ${PYPKGPREFIX}-ijson>=3.0:../../devel/py-ijson
 DEPENDS+=      ${PYPKGPREFIX}-psycopg2>=2.7:../../databases/py-psycopg2
 DEPENDS+=      ${PYPKGPREFIX}-lxml>=3.5.0:../../textproc/py-lxml
+DEPENDS+=      ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
 
-PYTHON_VERSIONED_DEPENDENCIES= Pillow
+PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-unpaddedbase64
 
 USE_PKG_RESOURCES=     yes
 
@@ -85,5 +86,4 @@ SUBST_VARS.pl=                        SYNAPSE_DEFAULT_CREATOR
 BUILD_DEFS+=                   SYNAPSE_DEFAULT_CREATOR_PL
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-signedjson/Makefile
diff -u pkgsrc/security/py-signedjson/Makefile:1.5 pkgsrc/security/py-signedjson/Makefile:1.6
--- pkgsrc/security/py-signedjson/Makefile:1.5  Tue Jan 25 09:05:11 2022
+++ pkgsrc/security/py-signedjson/Makefile      Wed Jan 26 07:19:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/01/25 09:05:11 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/26 07:19:03 wiz Exp $
 
 DISTNAME=      signedjson-1.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,19 +11,15 @@ COMMENT=    Signs JSON objects with ED25519
 LICENSE=       apache-2.0
 
 DEPENDS+=      ${PYPKGPREFIX}-canonicaljson>=1.0.0:../../devel/py-canonicaljson
+DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata
 DEPENDS+=      ${PYPKGPREFIX}-nacl>=0.3.0:../../security/py-nacl
 DEPENDS+=      ${PYPKGPREFIX}-typing-extensions>=3.5:../../devel/py-typing-extensions
 DEPENDS+=      ${PYPKGPREFIX}-unpaddedbase64>=1.0.1:../../devel/py-unpaddedbase64
-.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} == 27
-DEPENDS+=      ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing
-.endif
+BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
 
-PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build
-PYTHON_VERSIONED_DEPENDENCIES+=        importlib-metadata
+PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-unpaddedbase64
 
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"