CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun May  1 09:11:49 UTC 2022

Modified Files:
        pkgsrc/filesystems/py-fs: Makefile
        pkgsrc/net/py-rpyc: Makefile

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

a dependency does not support python 2.x any longer


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/filesystems/py-fs/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/py-rpyc/Makefile

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

Modified files:

Index: pkgsrc/filesystems/py-fs/Makefile
diff -u pkgsrc/filesystems/py-fs/Makefile:1.9 pkgsrc/filesystems/py-fs/Makefile:1.10
--- pkgsrc/filesystems/py-fs/Makefile:1.9       Mon Feb  7 20:57:20 2022
+++ pkgsrc/filesystems/py-fs/Makefile   Sun May  1 09:11:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/02/07 20:57:20 adam Exp $
+# $NetBSD: Makefile,v 1.10 2022/05/01 09:11:49 wiz Exp $
 
 DISTNAME=      fs-2.4.15
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,6 +11,7 @@ COMMENT=      Python's filesystem abstraction
 LICENSE=       mit
 
 DEPENDS+=      ${PYPKGPREFIX}-appdirs>=1.4.3:../../devel/py-appdirs
+DEPENDS+=      ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=      ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.10:../../lang/py-six
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
@@ -18,19 +19,11 @@ TEST_DEPENDS+=      ${PYPKGPREFIX}-parameteri
 TEST_DEPENDS+= ${PYPKGPREFIX}-pyftpdlib-[0-9]*:../../net/py-pyftpdlib
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
-.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} == 27
-DEPENDS+=      ${PYPKGPREFIX}-backports.os>=0.1:../../devel/py-backports.os
-DEPENDS+=      ${PYPKGPREFIX}-enum34>=1.1.6:../../devel/py-enum34
-DEPENDS+=      ${PYPKGPREFIX}-typing>=3.6:../../devel/py-typing
-.else
-PYSETUPTESTTARGET=     pytest
-.endif
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-PYTHON_VERSIONED_DEPENDENCIES+=        setuptools
+PYSETUPTESTTARGET=     pytest
 
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-rpyc/Makefile
diff -u pkgsrc/net/py-rpyc/Makefile:1.6 pkgsrc/net/py-rpyc/Makefile:1.7
--- pkgsrc/net/py-rpyc/Makefile:1.6     Tue Jan  4 19:54:28 2022
+++ pkgsrc/net/py-rpyc/Makefile Sun May  1 09:11:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 19:54:28 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/05/01 09:11:49 wiz Exp $
 
 DISTNAME=      rpyc-4.1.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,5 +13,7 @@ LICENSE=      mit
 
 DEPENDS+=      ${PYPKGPREFIX}-plumbum>=1.6.1:../../devel/py-plumbum
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"