CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Sep 11 18:10:03 UTC 2022

Modified Files:
        pkgsrc/devel/py-pyutil: Makefile
        pkgsrc/devel/py-thrift: Makefile
        pkgsrc/devel/py-tubes: Makefile
        pkgsrc/net/py-txamqp: Makefile

Log Message:
*: mark as not for python 2.x


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/py-pyutil/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-thrift/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-tubes/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/py-txamqp/Makefile

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

Modified files:

Index: pkgsrc/devel/py-pyutil/Makefile
diff -u pkgsrc/devel/py-pyutil/Makefile:1.27 pkgsrc/devel/py-pyutil/Makefile:1.28
--- pkgsrc/devel/py-pyutil/Makefile:1.27        Sun Feb 13 08:53:43 2022
+++ pkgsrc/devel/py-pyutil/Makefile     Sun Sep 11 18:10:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2022/02/13 08:53:43 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2022/09/11 18:10:03 wiz Exp $
 
 DISTNAME=      pyutil-3.3.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,8 +13,9 @@ 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>=0:../../net/py-twisted
 
-PYTHON_VERSIONED_DEPENDENCIES+=        twisted:test
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 USE_LANGUAGES= # none
 
@@ -26,5 +27,4 @@ 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"

Index: pkgsrc/devel/py-thrift/Makefile
diff -u pkgsrc/devel/py-thrift/Makefile:1.6 pkgsrc/devel/py-thrift/Makefile:1.7
--- pkgsrc/devel/py-thrift/Makefile:1.6 Sun Feb 13 08:53:43 2022
+++ pkgsrc/devel/py-thrift/Makefile     Sun Sep 11 18:10:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/02/13 08:53:43 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/09/11 18:10:03 wiz Exp $
 
 PKGREVISION= 1
 .include "../../devel/thrift/Makefile.version"
@@ -11,12 +11,12 @@ EXTRACT_ELEMENTS=   ${DISTNAME}/lib/py
 
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.7.2:../../lang/py-six
 TEST_DEPENDS+= ${PYPKGPREFIX}-scons-[0-9]*:../../devel/scons
-
-PYTHON_VERSIONED_DEPENDENCIES+=        twisted:test
+TEST_DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 
 USE_LANGUAGES= c c++
 PYSETUPSUBDIR= lib/py
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-tubes/Makefile
diff -u pkgsrc/devel/py-tubes/Makefile:1.4 pkgsrc/devel/py-tubes/Makefile:1.5
--- pkgsrc/devel/py-tubes/Makefile:1.4  Sun Feb 13 09:44:10 2022
+++ pkgsrc/devel/py-tubes/Makefile      Sun Sep 11 18:10:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/02/13 09:44:10 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/09/11 18:10:03 wiz Exp $
 
 DISTNAME=      tubes-0.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -15,13 +15,13 @@ 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
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 USE_LANGUAGES= # none
 
 EGG_NAME=      Tubes-${PKGVERSION_NOREV}
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-txamqp/Makefile
diff -u pkgsrc/net/py-txamqp/Makefile:1.12 pkgsrc/net/py-txamqp/Makefile:1.13
--- pkgsrc/net/py-txamqp/Makefile:1.12  Sun Feb 13 08:53:44 2022
+++ pkgsrc/net/py-txamqp/Makefile       Sun Sep 11 18:10:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2022/02/13 08:53:44 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/09/11 18:10:03 wiz Exp $
 
 DISTNAME=      txAMQP-0.8.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -12,11 +12,11 @@ COMMENT=    Python library for communicatin
 LICENSE=       apache-2.0
 
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
+DEPENDS+=      ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 
-PYTHON_VERSIONED_DEPENDENCIES+=        twisted
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"