CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun May  1 09:17:48 UTC 2022

Modified Files:
        pkgsrc/devel/py-case: Makefile
        pkgsrc/parallel/py-billiard: Makefile PLIST

Log Message:
py-case, py-billiard: not for python 2.x


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-case/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/parallel/py-billiard/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/parallel/py-billiard/PLIST

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-case/Makefile
diff -u pkgsrc/devel/py-case/Makefile:1.4 pkgsrc/devel/py-case/Makefile:1.5
--- pkgsrc/devel/py-case/Makefile:1.4   Thu Jan 27 11:39:38 2022
+++ pkgsrc/devel/py-case/Makefile       Sun May  1 09:17:48 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/27 11:39:38 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/05/01 09:17:48 wiz Exp $
 
 DISTNAME=      case-1.5.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -18,11 +18,7 @@ TEST_DEPENDS+=       ${PYPKGPREFIX}-coverage>=
 
 USE_LANGUAGES=         # none
 
-.include "../../lang/python/pyversion.mk"
-
-.if ${PYPKGPREFIX} == "py27"
-DEPENDS+=      ${PYPKGPREFIX}-unittest2>=0.5.1:../../devel/py-unittest2
-.endif
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/parallel/py-billiard/Makefile
diff -u pkgsrc/parallel/py-billiard/Makefile:1.21 pkgsrc/parallel/py-billiard/Makefile:1.22
--- pkgsrc/parallel/py-billiard/Makefile:1.21   Tue Jan  4 20:54:35 2022
+++ pkgsrc/parallel/py-billiard/Makefile        Sun May  1 09:17:48 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2022/01/04 20:54:35 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2022/05/01 09:17:48 wiz Exp $
 
 DISTNAME=      billiard-3.6.4.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,11 +14,9 @@ LICENSE=     modified-bsd
 TEST_DEPENDS+= ${PYPKGPREFIX}-case>=1.3.1:../../devel/py-case
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
-.include "../../lang/python/pyversion.mk"
-# builds _billiard.so
-.if ${_PYTHON_VERSION} != 27
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 USE_LANGUAGES=         # none
-.endif
 
 PYSETUPTESTTARGET=     pytest
 

Index: pkgsrc/parallel/py-billiard/PLIST
diff -u pkgsrc/parallel/py-billiard/PLIST:1.6 pkgsrc/parallel/py-billiard/PLIST:1.7
--- pkgsrc/parallel/py-billiard/PLIST:1.6       Sun Apr  9 16:43:03 2017
+++ pkgsrc/parallel/py-billiard/PLIST   Sun May  1 09:17:48 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2017/04/09 16:43:03 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/05/01 09:17:48 wiz Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -7,7 +7,6 @@ ${PYSITELIB}/${EGG_INFODIR}/top_level.tx
 ${PYSITELIB}/billiard/__init__.py
 ${PYSITELIB}/billiard/__init__.pyc
 ${PYSITELIB}/billiard/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/_billiard.so
 ${PYSITELIB}/billiard/_ext.py
 ${PYSITELIB}/billiard/_ext.pyc
 ${PYSITELIB}/billiard/_ext.pyo