CVS commit: pkgsrc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu May  2 09:27:09 UTC 2019

Modified Files:
        pkgsrc/devel/py-line_profiler: Makefile PLIST
        pkgsrc/textproc/py-sphinx: Makefile
        pkgsrc/textproc/py-sphinx-autodoc-typehints: Makefile
        pkgsrc/www/py-tornado: Makefile

Log Message:
Forget about Python 3.4


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-line_profiler/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-line_profiler/PLIST
cvs rdiff -u -r1.62 -r1.63 pkgsrc/textproc/py-sphinx/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/py-sphinx-autodoc-typehints/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/www/py-tornado/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-line_profiler/Makefile
diff -u pkgsrc/devel/py-line_profiler/Makefile:1.5 pkgsrc/devel/py-line_profiler/Makefile:1.6
--- pkgsrc/devel/py-line_profiler/Makefile:1.5  Tue Aug  7 16:45:10 2018
+++ pkgsrc/devel/py-line_profiler/Makefile      Thu May  2 09:27:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/08/07 16:45:10 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2019/05/02 09:27:09 adam Exp $
 
 DISTNAME=      line_profiler-2.1.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -19,13 +19,7 @@ post-install:
 PYTHON_VERSIONED_DEPENDENCIES= ipython
 
 .include "../../lang/python/pyversion.mk"
-
-PLIST_VARS+=   py35
-.if "${PYPKGPREFIX}" != "py27" && "${PYPKGPREFIX}" != "py34"
-PLIST.py35=    yes
-.endif
-
-.if "${PYPKGPREFIX}" == "py37"
+.if ${_PYTHON_VERSION} == 37
 # Regenerate _line_profiler.c with recent cython
 BUILDLINK_DEPMETHOD.py-cython= build
 .include "../../devel/py-cython/buildlink3.mk"

Index: pkgsrc/devel/py-line_profiler/PLIST
diff -u pkgsrc/devel/py-line_profiler/PLIST:1.2 pkgsrc/devel/py-line_profiler/PLIST:1.3
--- pkgsrc/devel/py-line_profiler/PLIST:1.2     Wed Jan 31 13:42:32 2018
+++ pkgsrc/devel/py-line_profiler/PLIST Thu May  2 09:27:09 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2018/01/31 13:42:32 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/05/02 09:27:09 adam Exp $
 bin/kernprof${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -14,5 +14,5 @@ ${PYSITELIB}/line_profiler.py
 ${PYSITELIB}/line_profiler.pyc
 ${PYSITELIB}/line_profiler.pyo
 ${PLIST.py3x}${PYSITELIB}/line_profiler_py35.py
-${PLIST.py35}${PYSITELIB}/line_profiler_py35.pyc
-${PLIST.py35}${PYSITELIB}/line_profiler_py35.pyo
+${PLIST.py3x}${PYSITELIB}/line_profiler_py35.pyc
+${PLIST.py3x}${PYSITELIB}/line_profiler_py35.pyo

Index: pkgsrc/textproc/py-sphinx/Makefile
diff -u pkgsrc/textproc/py-sphinx/Makefile:1.62 pkgsrc/textproc/py-sphinx/Makefile:1.63
--- pkgsrc/textproc/py-sphinx/Makefile:1.62     Sun Mar 10 13:36:02 2019
+++ pkgsrc/textproc/py-sphinx/Makefile  Thu May  2 09:27:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2019/03/10 13:36:02 adam Exp $
+# $NetBSD: Makefile,v 1.63 2019/05/02 09:27:09 adam Exp $
 
 DISTNAME=      Sphinx-1.8.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -24,7 +24,7 @@ DEPENDS+=     ${PYPKGPREFIX}-sphinxcontrib-w
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.5:../../lang/py-six
 
 .include "../../lang/python/pyversion.mk"
-.if "${PYPKGPREFIX}" == "py27" || "${PYPKGPREFIX}" == "py34"
+.if ${_PYTHON_VERSION} == 27
 DEPENDS+=      ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing
 .endif
 

Index: pkgsrc/textproc/py-sphinx-autodoc-typehints/Makefile
diff -u pkgsrc/textproc/py-sphinx-autodoc-typehints/Makefile:1.2 pkgsrc/textproc/py-sphinx-autodoc-typehints/Makefile:1.3
--- pkgsrc/textproc/py-sphinx-autodoc-typehints/Makefile:1.2    Thu Sep 27 22:38:59 2018
+++ pkgsrc/textproc/py-sphinx-autodoc-typehints/Makefile        Thu May  2 09:27:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/09/27 22:38:59 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2019/05/02 09:27:09 adam Exp $
 
 DISTNAME=      sphinx-autodoc-typehints-1.3.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -18,10 +18,5 @@ USE_LANGUAGES=       # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-.include "../../lang/python/pyversion.mk"
-.if "${PYPKGPREFIX}" == "py34"
-DEPENDS+=      ${PYPKGPREFIX}-typing>=3.5:../../devel/py-typing
-.endif
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-tornado/Makefile
diff -u pkgsrc/www/py-tornado/Makefile:1.27 pkgsrc/www/py-tornado/Makefile:1.28
--- pkgsrc/www/py-tornado/Makefile:1.27 Mon Sep 17 10:15:39 2018
+++ pkgsrc/www/py-tornado/Makefile      Thu May  2 09:27:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2018/09/17 10:15:39 adam Exp $
+# $NetBSD: Makefile,v 1.28 2019/05/02 09:27:09 adam Exp $
 
 DISTNAME=      tornado-5.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -18,18 +18,16 @@ REPLACE_PYTHON+=    tornado/platform/*.py
 REPLACE_PYTHON+=       tornado/test/*.py
 
 do-test:
-       ${RUN}cd ${WRKSRC}; ${PYTHONBIN} -m tornado.test.runtests
+       cd ${WRKSRC} && ${PYTHONBIN} -m tornado.test.runtests
 
 .include "../../lang/python/pyversion.mk"
 
 PLIST_VARS+=   requires
-.if "${PYPKGPREFIX}" == "py27"
+.if ${_PYTHON_VERSION} == 27
+DEPENDS+=      ${PYPKGPREFIX}-backports_abc>=0.4:../../devel/py-backports_abc
 DEPENDS+=      ${PYPKGPREFIX}-backports.ssl_match_hostname-[0-9]*:../../security/py-backports.ssl_match_hostname
 DEPENDS+=      ${PYPKGPREFIX}-certifi-[0-9]*:../../security/py-certifi
 DEPENDS+=      ${PYPKGPREFIX}-singledispatch>0:../../devel/py-singledispatch
-.endif
-.if "${PYPKGPREFIX}" == "py27" || "${PYPKGPREFIX}" == "py34"
-DEPENDS+=      ${PYPKGPREFIX}-backports_abc>=0.4:../../devel/py-backports_abc
 PLIST.requires=        yes
 .endif