*: use versioned_dependencies for py-twisted

21 files changed, 68 insertions, 42 deletions

diff --git a/audio/py-musique/Makefile b/audio/py-musique/Makefile
index 3673ee7daa1..c7b428a320b 100644
--- a/audio/py-musique/Makefile
+++ b/audio/py-musique/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2022/01/22 15:49:05 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2022/02/13 08:53:42 wiz Exp $
 
 DISTNAME=	pymusique-0.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -16,7 +16,7 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted19
 DEPENDS+=	${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
 DEPENDS+=	${PYPKGPREFIX}-mcrypt-[0-9]*:../../security/py-mcrypt
 DEPENDS+=	${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2
diff --git a/converters/py-zfec/Makefile b/converters/py-zfec/Makefile
index b9e4fd34928..ba0a6c08929 100644
--- a/converters/py-zfec/Makefile
+++ b/converters/py-zfec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2022/01/05 15:40:59 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2022/02/13 08:53:42 wiz Exp $
 
 DISTNAME=	zfec-1.5.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,8 @@ LICENSE=	gnu-gpl-v2
 DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 DEPENDS+=	${PYPKGPREFIX}-pyutil>=3.0.0:../../devel/py-pyutil
 TEST_DEPENDS+=	${PYPKGPREFIX}-setuptools_trial-[0-9]*:../../devel/py-setuptools_trial
-TEST_DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+
+PYTHON_VERSIONED_DEPENDENCIES+=	twisted:test
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
@@ -34,5 +35,6 @@ post-install:
 .endfor
 
 .include "../../lang/python/application.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-carbon/Makefile b/databases/py-carbon/Makefile
index 7ea9ac248ee..1134be15ab0 100644
--- a/databases/py-carbon/Makefile
+++ b/databases/py-carbon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2022/01/10 21:56:04 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/02/13 08:53:42 wiz Exp $
 
 DISTNAME=	carbon-0.9.15
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ HOMEPAGE=	https://launchpad.net/graphite
 COMMENT=	Backend storage application for graphite
 LICENSE=	apache-2.0
 
-DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted19
 DEPENDS+=	${PYPKGPREFIX}-whisper>=${PKGVERSION_NOREV}:../../databases/py-whisper
 
 USE_LANGUAGES=	# none
diff --git a/devel/py-buildbot-worker/Makefile b/devel/py-buildbot-worker/Makefile
index ab104149c03..75a29eaaa9f 100644
--- a/devel/py-buildbot-worker/Makefile
+++ b/devel/py-buildbot-worker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2022/01/05 15:41:02 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/02/13 08:53:43 wiz Exp $
 
 DISTNAME=	buildbot-worker-2.6.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,10 +12,11 @@ COMMENT=	Worker for the buildbot CI system
 LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
-DEPENDS+=	${PYPKGPREFIX}-twisted>=17.9.0:../../net/py-twisted
 BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools_trial-[0-9]*:../../devel/py-setuptools_trial
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 
+PYTHON_VERSIONED_DEPENDENCIES+=	twisted
+
 USE_LANGUAGES=	# none
 
 USE_PKG_RESOURCES=	yes
@@ -26,4 +27,5 @@ post-install:
 	${MV} buildbot_worker_windows_service buildbot_worker_windows_service-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-doctor/Makefile b/devel/py-doctor/Makefile
index eb3c6cbf444..1e88549afe9 100644
--- a/devel/py-doctor/Makefile
+++ b/devel/py-doctor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2022/01/04 20:53:01 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2022/02/13 08:53:43 wiz Exp $
 
 DISTNAME=	pydoctor-16.3.0
 PKGNAME=	${DISTNAME:S/py/${PYPKGPREFIX}-/}
@@ -12,7 +12,7 @@ COMMENT=	API doc generator
 LICENSE=	mit
 
 DEPENDS+=	epydoc-[0-9]*:../../devel/epydoc
-DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted19
 
 USE_LANGUAGES=	# none
 
diff --git a/devel/py-jersey/Makefile b/devel/py-jersey/Makefile
index 276b2d3358b..b87b9ad2560 100644
--- a/devel/py-jersey/Makefile
+++ b/devel/py-jersey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/01/04 20:53:13 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2022/02/13 08:53:43 wiz Exp $
 
 DISTNAME=	jersey-0.1.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,8 +11,8 @@ HOMEPAGE=	https://pypi.python.org/pypi/jersey
 COMMENT=	Framework for building Twisted Python command-line interfaces
 LICENSE=	modified-bsd
 
-#BUILD_DEPENDS+=	${PYPKGPREFIX}-twisted>=10.0.0:../../net/py-twisted
-DEPENDS+=		${PYPKGPREFIX}-twisted>=10.0.0:../../net/py-twisted
+#BUILD_DEPENDS+=	${PYPKGPREFIX}-twisted>=10.0.0:../../net/py-twisted19
+DEPENDS+=		${PYPKGPREFIX}-twisted>=10.0.0:../../net/py-twisted19
 DEPENDS+=		${PYPKGPREFIX}-automat-[0-9]*:../../devel/py-automat
 
 PYTHON_VERSIONS_ACCEPTED=	27 # as of 0.1.5
diff --git a/devel/py-pyutil/Makefile b/devel/py-pyutil/Makefile
index fb622b4dfa4..d45abc86f15 100644
--- a/devel/py-pyutil/Makefile
+++ b/devel/py-pyutil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2022/01/05 15:41:07 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2022/02/13 08:53:43 wiz Exp $
 
 DISTNAME=	pyutil-3.3.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,8 @@ LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	${PYPKGPREFIX}-simplejson>=2.1.0:../../converters/py-simplejson
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock>=1.3.0:../../devel/py-mock
-TEST_DEPENDS+=	${PYPKGPREFIX}-twisted>=15.5.0:../../net/py-twisted
+
+PYTHON_VERSIONED_DEPENDENCIES+=	twisted:test
 
 USE_LANGUAGES=	# none
 
@@ -25,4 +26,5 @@ post-extract:
 	${FIND} ${WRKSRC} -name __pycache__ -or -name '*.pyc' -exec ${RM} -R {} +
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-setuptools_trial/Makefile b/devel/py-setuptools_trial/Makefile
index 210a8a50f95..195199f8391 100644
--- a/devel/py-setuptools_trial/Makefile
+++ b/devel/py-setuptools_trial/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2022/01/04 20:53:39 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2022/02/13 08:53:43 wiz Exp $
 
 DISTNAME=	setuptools_trial-0.6.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,11 +11,12 @@ HOMEPAGE=	https://github.com/rutsky/setuptools-trial
 COMMENT=	Setuptools plugin for Twisted-based unit tests
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-twisted>=2.4.0:../../net/py-twisted
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-virtualenv-[0-9]*:../../devel/py-test-virtualenv
 TEST_DEPENDS+=	${PYPKGPREFIX}-virtualenv-[0-9]*:../../devel/py-virtualenv
 
+PYTHON_VERSIONED_DEPENDENCIES+=	twisted
+
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/pyversion.mk"
@@ -24,4 +25,5 @@ DEPENDS+=	${PYPKGPREFIX}-pathlib2-[0-9]*:../../devel/py-pathlib2
 .endif
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-thrift/Makefile b/devel/py-thrift/Makefile
index 654497958e3..26887744eb7 100644
--- a/devel/py-thrift/Makefile
+++ b/devel/py-thrift/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:53:44 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/02/13 08:53:43 wiz Exp $
 
 PKGREVISION= 1
 .include "../../devel/thrift/Makefile.version"
@@ -11,10 +11,12 @@ EXTRACT_ELEMENTS=	${DISTNAME}/lib/py
 
 DEPENDS+=	${PYPKGPREFIX}-six>=1.7.2:../../lang/py-six
 TEST_DEPENDS+=	${PYPKGPREFIX}-scons-[0-9]*:../../devel/scons
-TEST_DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+
+PYTHON_VERSIONED_DEPENDENCIES+=	twisted:test
 
 USE_LANGUAGES=	c c++
 PYSETUPSUBDIR=	lib/py
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-treq/Makefile b/devel/py-treq/Makefile
index 69f10f7f8ef..86209139b29 100644
--- a/devel/py-treq/Makefile
+++ b/devel/py-treq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/02/05 14:26:37 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/02/13 08:53:43 wiz Exp $
 
 DISTNAME=	treq-22.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,9 +14,11 @@ DEPENDS+=	${PYPKGPREFIX}-attrs-[0-9]*:../../devel/py-attrs
 DEPENDS+=	${PYPKGPREFIX}-incremental-[0-9]*:../../devel/py-incremental
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-requests>=2.1.0:../../devel/py-requests
-DEPENDS+=	${PYPKGPREFIX}-twisted>=16.4.0:../../net/py-twisted
+
+PYTHON_VERSIONED_DEPENDENCIES+=	twisted
 
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-tubes/Makefile b/devel/py-tubes/Makefile
index 9f9d020306d..baa03a4307e 100644
--- a/devel/py-tubes/Makefile
+++ b/devel/py-tubes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:53:45 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/02/13 08:53:43 wiz Exp $
 
 GITHUB_PROJECT=	tubes
 GITHUB_TAG=	v0.2.0
@@ -16,10 +16,12 @@ LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-characteristic-[0-9]*:../../devel/py-characteristic
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+
+PYTHON_VERSIONED_DEPENDENCIES+=	twisted
 
 WRKSRC=		${WRKDIR}/tubes-0.2.0
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-txgithub/Makefile b/devel/py-txgithub/Makefile
index 8eb2525ab4a..a91489d9a79 100644
--- a/devel/py-txgithub/Makefile
+++ b/devel/py-txgithub/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:53:46 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/02/13 08:53:43 wiz Exp $
 
 DISTNAME=	txgithub-15.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,8 @@ COMMENT=	GitHub API client using Twisted
 LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
-DEPENDS+=	${PYPKGPREFIX}-twisted>=12.3.0:../../net/py-twisted
+
+PYTHON_VERSIONED_DEPENDENCIES+=	twisted
 
 USE_LANGUAGES=	# none
 
@@ -22,4 +23,5 @@ post-install:
 		${MV} gist gist-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-txrequests/Makefile b/devel/py-txrequests/Makefile
index a75e6cb9f96..facabeea6ff 100644
--- a/devel/py-txrequests/Makefile
+++ b/devel/py-txrequests/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:53:46 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/02/13 08:53:44 wiz Exp $
 
 DISTNAME=	txrequests-0.9.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,9 +12,11 @@ COMMENT=	Asynchronous Python HTTP Requests for Humans
 LICENSE=	apache-2.0
 
 DEPENDS+=	${PYPKGPREFIX}-requests>=1.2.0:../../devel/py-requests
-DEPENDS+=	${PYPKGPREFIX}-twisted>=9.0.0:../../net/py-twisted
+
+PYTHON_VERSIONED_DEPENDENCIES+=	twisted
 
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/coherence/Makefile b/net/coherence/Makefile
index 2214367c025..54df26ce9e9 100644
--- a/net/coherence/Makefile
+++ b/net/coherence/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2022/01/05 15:41:15 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2022/02/13 08:53:44 wiz Exp $
 
 DISTNAME=	Coherence-0.6.6.2
 PKGNAME=	coherence-0.6.6.2
@@ -12,7 +12,7 @@ COMMENT=	Media server framework
 
 USE_LANGUAGES=	# none
 
-DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted19
 
 PYTHON_VERSIONS_ACCEPTED=	27 # as of 0.6.6.2
 
diff --git a/net/py-foolscap/Makefile b/net/py-foolscap/Makefile
index 47536ae3249..d14776be52f 100644
--- a/net/py-foolscap/Makefile
+++ b/net/py-foolscap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2022/01/05 15:41:16 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2022/02/13 08:53:44 wiz Exp $
 
 DISTNAME=	foolscap-21.7.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,8 @@ LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=0.6:../../security/py-OpenSSL
 DEPENDS+=	${PYPKGPREFIX}-ZopeInterface>=3.6.1:../../devel/py-ZopeInterface
-DEPENDS+=	${PYPKGPREFIX}-twisted>=16.0:../../net/py-twisted
+
+PYTHON_VERSIONED_DEPENDENCIES+=	twisted
 
 # \todo Restore tests
 #TEST_TARGET=	test
@@ -33,4 +34,5 @@ post-install:
 		${DESTDIR}${PREFIX}/share/doc/py-foolscap
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-twisted-docs/Makefile b/net/py-twisted-docs/Makefile
index e697423a7b3..a5c644455f1 100644
--- a/net/py-twisted-docs/Makefile
+++ b/net/py-twisted-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2016/04/13 19:45:38 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2022/02/13 08:53:44 wiz Exp $
 
 PKGNAME=	py-${DISTNAME:S/Twisted/twisted-docs/}
 COMMENT=	Framework for writing networked applications (documentation)
@@ -14,6 +14,8 @@ PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
 INSTALLATION_DIRS=	${HTMLDIR}
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
 do-install:
 	cd ${DOC_SRCDIR} && pax -rw -pp * ${DESTDIR}${PREFIX}/${HTMLDIR}
 	cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
diff --git a/net/py-txamqp/Makefile b/net/py-txamqp/Makefile
index c6a7cd536c8..7e6c7b17da0 100644
--- a/net/py-txamqp/Makefile
+++ b/net/py-txamqp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2022/01/10 20:52:10 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/02/13 08:53:44 wiz Exp $
 
 DISTNAME=	txAMQP-0.8.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -11,10 +11,12 @@ HOMEPAGE=	https://github.com/txamqp/txamqp
 COMMENT=	Python library for communicating with AMQP using Twisted
 LICENSE=	apache-2.0
 
-DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
+PYTHON_VERSIONED_DEPENDENCIES+=	twisted
+
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/hellanzb/Makefile b/news/hellanzb/Makefile
index 7a5fd1ca43f..8a592ae0fdb 100644
--- a/news/hellanzb/Makefile
+++ b/news/hellanzb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2022/01/10 18:18:22 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2022/02/13 08:53:44 wiz Exp $
 #
 .include "../../news/hellanzb/Makefile.version"
 
@@ -13,7 +13,7 @@ HOMEPAGE=		https://github.com/pjenvey/hellanzb
 COMMENT=		Command line nntp file grabber
 LICENSE=		modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-twisted>=1.3:../../net/py-twisted
+DEPENDS+=	${PYPKGPREFIX}-twisted>=1.3:../../net/py-twisted19
 DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 DEPENDS+=	par2>=0.4:../../archivers/par2
 DEPENDS+=	unrar>=3.5.4:../../archivers/unrar
diff --git a/textproc/py-jsonschema/Makefile b/textproc/py-jsonschema/Makefile
index 9b15c7f1877..32430f929a4 100644
--- a/textproc/py-jsonschema/Makefile
+++ b/textproc/py-jsonschema/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2022/01/25 09:05:11 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2022/02/13 08:53:44 wiz Exp $
 
 DISTNAME=	jsonschema-3.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,6 @@ LICENSE=	modified-bsd
 DEPENDS+=	${PYPKGPREFIX}-attrs>=17.4.0:../../devel/py-attrs
 DEPENDS+=	${PYPKGPREFIX}-pyrsistent>=0.14.0:../../devel/py-pyrsistent
 DEPENDS+=	${PYPKGPREFIX}-six>=1.11.0:../../lang/py-six
-TEST_DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
@@ -26,6 +25,7 @@ PYTHON_VERSIONED_DEPENDENCIES+=	importlib-metadata
 USE_PKG_RESOURCES=	yes
 
 PYTHON_VERSIONED_DEPENDENCIES+=	setuptools_scm:build
+PYTHON_VERSIONED_DEPENDENCIES+=	twisted:test
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
diff --git a/www/py-klein/Makefile b/www/py-klein/Makefile
index 07c3c1ca829..d7ba6ad4e0c 100644
--- a/www/py-klein/Makefile
+++ b/www/py-klein/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:55:31 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/02/13 08:53:44 wiz Exp $
 
 DISTNAME=	klein-20.6.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -16,11 +16,13 @@ DEPENDS+=	${PYPKGPREFIX}-attrs-[0-9]*:../../devel/py-attrs
 DEPENDS+=	${PYPKGPREFIX}-hyperlink-[0-9]*:../../www/py-hyperlink
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-tubes-[0-9]*:../../devel/py-tubes
-DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 DEPENDS+=	${PYPKGPREFIX}-werkzeug-[0-9]*:../../www/py-werkzeug
 DEPENDS+=	${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
 
+PYTHON_VERSIONED_DEPENDENCIES+=	twisted
+
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-nevow/Makefile b/www/py-nevow/Makefile
index 34c479bfa15..547a9f60db5 100644
--- a/www/py-nevow/Makefile
+++ b/www/py-nevow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2022/01/05 20:07:11 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2022/02/13 08:53:44 wiz Exp $
 
 DISTNAME=	Nevow-0.14.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -11,7 +11,7 @@ HOMEPAGE=	https://github.com/twisted/nevow
 COMMENT=	Next-generation web application templating system
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-twisted>=13.0:../../net/py-twisted
+DEPENDS+=	${PYPKGPREFIX}-twisted>=13.0:../../net/py-twisted19
 
 USE_LANGUAGES=		# none