Remove more references to python-2.6.

15 files changed, 25 insertions, 41 deletions

diff --git a/audio/py-audiotools/Makefile b/audio/py-audiotools/Makefile
index d8bf5a20716..bc01feec30c 100644
--- a/audio/py-audiotools/Makefile
+++ b/audio/py-audiotools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2015/04/13 23:12:40 rodent Exp $
+# $NetBSD: Makefile,v 1.14 2015/04/14 11:40:31 wiz Exp $
 
 DISTNAME=	audiotools-2.22
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -18,7 +18,7 @@ REPLACE_PYTHON+=	audiotools/*.py
 REPLACE_PYTHON+=	audiotools/py_decoders/*.py
 REPLACE_PYTHON+=	audiotools/py_encoders/*.py
 
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 2.20 or rejected
+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 2.20
 
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
diff --git a/devel/py-argh/Makefile b/devel/py-argh/Makefile
index e11d28e56dc..5bf71200982 100644
--- a/devel/py-argh/Makefile
+++ b/devel/py-argh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/12/16 07:00:52 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/04/14 11:40:31 wiz Exp $
 
 DISTNAME=	argh-0.26.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,9 +13,4 @@ LICENSE=	gnu-lgpl-v3
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
-PLIST_VARS+=	py26
-.if !empty(_PYTHON_VERSION:M26)
-DEPENDS+=	${PYPKGPREFIX}-argparse>=1.1:../../devel/py-argparse
-PLIST.py26=	yes
-.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-argh/PLIST b/devel/py-argh/PLIST
index 16225d06fd5..ce050469f39 100644
--- a/devel/py-argh/PLIST
+++ b/devel/py-argh/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2014/12/16 07:00:52 obache Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/04/14 11:40:31 wiz Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PLIST.py26}${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/argh/__init__.py
 ${PYSITELIB}/argh/__init__.pyc
diff --git a/devel/py-mercurial/Makefile.version b/devel/py-mercurial/Makefile.version
index 0f5c2c8f392..c0032432135 100644
--- a/devel/py-mercurial/Makefile.version
+++ b/devel/py-mercurial/Makefile.version
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.16 2015/04/03 10:09:15 wiz Exp $
+# $NetBSD: Makefile.version,v 1.17 2015/04/14 11:40:31 wiz Exp $
 
 VERSION=	3.3.3
 
@@ -10,6 +10,6 @@ PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 2.9
 # for python-3.x
 #.include "../../lang/python/pyversion.mk"
 #
-#.if ("${PYPKGPREFIX}" != "py26") && ("${PYPKGPREFIX}" != "py27")
+#.if "${PYPKGPREFIX}" != "py27"
 #PYSETUPARGS+=	--c2to3
 #.endif
diff --git a/devel/py-trytond/Makefile.common b/devel/py-trytond/Makefile.common
index 70abdffe19d..84350808172 100644
--- a/devel/py-trytond/Makefile.common
+++ b/devel/py-trytond/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2015/04/13 23:12:41 rodent Exp $
+# $NetBSD: Makefile.common,v 1.5 2015/04/14 11:40:31 wiz Exp $
 
 # used by meta-pkgs/py-tryton-platform/Makefile
 # used by devel/py-proteus/Makefile
@@ -132,4 +132,4 @@ MASTER_SITES=   ${TRYTON_SITES}
 
 DIST_SUBDIR=	tryton-${TRYTON_BASEVER}
 
-PYTHON_VERSIONS_INCOMPATIBLE=   33 34 # 33: py-gtk2 via py-pycha via py-relatorio
+PYTHON_VERSIONS_INCOMPATIBLE=   33 34 # py-gtk2 via py-pycha via py-relatorio
diff --git a/graphics/py-qrcode/Makefile b/graphics/py-qrcode/Makefile
index 8886e01c1a9..a71fb99a5b3 100644
--- a/graphics/py-qrcode/Makefile
+++ b/graphics/py-qrcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/04/11 03:12:51 rodent Exp $
+# $NetBSD: Makefile,v 1.5 2015/04/14 11:40:31 wiz Exp $
 
 DISTNAME=	qrcode-5.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=	${MASTER_SITE_GITHUB:=lincolnloop/python-qrcode}
 COMMENT=	Python QR Code image generator
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml # XXX for py26
+DEPENDS+=	${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
 DEPENDS+=	${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
diff --git a/lang/python/extension.mk b/lang/python/extension.mk
index 84315fa87bf..1cd05a9340f 100644
--- a/lang/python/extension.mk
+++ b/lang/python/extension.mk
@@ -1,4 +1,4 @@
-# $NetBSD: extension.mk,v 1.38 2015/04/13 23:12:44 rodent Exp $
+# $NetBSD: extension.mk,v 1.39 2015/04/14 11:40:31 wiz Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -53,6 +53,7 @@ do-test:
 # appears to be that creating egg info files was new in Python 2.5.
 PY_NO_EGG?=		yes
 .if !empty(PY_NO_EGG:M[yY][eE][sS])
+# see python*/patches/patch-av
 INSTALL_ENV+=		PKGSRC_PYTHON_NO_EGG=defined
 .endif
 
diff --git a/math/py-rpy/Makefile b/math/py-rpy/Makefile
index 462068ebb90..e0557efd804 100644
--- a/math/py-rpy/Makefile
+++ b/math/py-rpy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2015/04/13 23:12:42 rodent Exp $
+# $NetBSD: Makefile,v 1.39 2015/04/14 11:40:31 wiz Exp $
 
 DISTNAME=	rpy2-2.5.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/rpy2/rpy/}
@@ -24,13 +24,10 @@ REPLACE_PYTHON=			rpy/tests.py
 .include "../../lang/python/pyversion.mk"
 
 PLIST_VARS=	sd
-.if ${PYPKGPREFIX} == "py26" || ${PYPKGPREFIX} == "py27" || ${PYPKGPREFIX} == "py33"
+.if ${PYPKGPREFIX} == "py27" || ${PYPKGPREFIX} == "py33"
 PLIST.sd=	yes
 DEPENDS+=	${PYPKGPREFIX}-singledispatch-[0-9]*:../../devel/py-singledispatch
 .endif
-.if ${PYPKGPREFIX} == "py26"
-DEPENDS+=	${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse
-.endif
 
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
diff --git a/net/py-twisted/Makefile b/net/py-twisted/Makefile
index bcf3acda144..2bc81a454a1 100644
--- a/net/py-twisted/Makefile
+++ b/net/py-twisted/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/01/27 18:49:19 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2015/04/14 11:40:32 wiz Exp $
 
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 COMMENT=	Framework for writing networked applications
@@ -36,10 +36,4 @@ CHECK_FILES_SKIP+=	${PREFIX}/${PYSITELIB}/twisted/plugins/dropin.cache
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/application.mk"
 
-# With python 2.6, twisted builds an additional object.
-PLIST_VARS+=		initgroups
-.if ${PYPKGPREFIX} == "py26"
-PLIST.initgroups=	YES
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-twisted/PLIST b/net/py-twisted/PLIST
index 55a6b81dc0a..e584bb85dc0 100644
--- a/net/py-twisted/PLIST
+++ b/net/py-twisted/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2014/07/22 22:33:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.16 2015/04/14 11:40:32 wiz Exp $
 bin/cftp
 bin/ckeygen
 bin/conch
@@ -1296,7 +1296,6 @@ ${PYSITELIB}/twisted/python/__init__.py
 ${PYSITELIB}/twisted/python/__init__.pyc
 ${PYSITELIB}/twisted/python/__init__.pyo
 ${PYSITELIB}/twisted/python/_initgroups.c
-${PLIST.initgroups}${PYSITELIB}/twisted/python/_initgroups.so
 ${PYSITELIB}/twisted/python/_inotify.py
 ${PYSITELIB}/twisted/python/_inotify.pyc
 ${PYSITELIB}/twisted/python/_inotify.pyo
diff --git a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
index 896bf2d8c64..af27ee65707 100755
--- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
+++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $NetBSD: pkg_rolling-replace.sh,v 1.34 2015/02/12 08:22:16 abs Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.35 2015/04/14 11:40:31 wiz Exp $
 #<license>
 # Copyright (c) 2006 BBN Technologies Corp.  All rights reserved.
 #
@@ -453,7 +453,7 @@ while [ -n "$REPLACE_TODO" ]; do
     # Set PKGNAME_REQD to give underlying make processes a chance to
     # set options derived from the package name.  For example,
     # the appropriate version of Python can be derived from the
-    # package name (so, when building py26-foo, use python-2.6,
+    # package name (so, when building py34-foo, use python-3.4,
     # not python-2.7).
     MAKE_SET_VARS="PKGNAME_REQD=${pkg}-*"
 
diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map
index d9b4656e683..aba0310e278 100644
--- a/pkgtools/pkglint/files/makevars.map
+++ b/pkgtools/pkglint/files/makevars.map
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.262 2015/03/11 19:05:58 rillig Exp $
+# $NetBSD: makevars.map,v 1.263 2015/04/14 11:40:31 wiz Exp $
 #
 
 # This file contains the guessed type of some variables, according to
@@ -657,7 +657,7 @@ PTHREAD_OPTS		List of { native optional require } [m:as,c:a,b:a]
 PTHREAD_TYPE		Identifier [$system]
 # ^^ or "native" or "none".
 PY_PATCHPLIST		Yes [$package]
-PYPKGPREFIX		{ py26 py27 py33 } [*:pu, pyversion.mk:s, *:]
+PYPKGPREFIX		{ py27 py33 py34 } [*:pu, pyversion.mk:s, *:]
 PYTHON_FOR_BUILD_ONLY	Yes [$package]
 REPLACE_PYTHON	List of Pathmask [$package_list]
 PYTHON_VERSIONS_ACCEPTED List of Version [$package]
diff --git a/security/py-cryptography/Makefile b/security/py-cryptography/Makefile
index bfc406ff6ca..74e49a42993 100644
--- a/security/py-cryptography/Makefile
+++ b/security/py-cryptography/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2015/04/12 14:42:30 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2015/04/14 11:40:31 wiz Exp $
 
 DISTNAME=	cryptography-0.8.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -22,7 +22,7 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-test>=0.8:../../devel/py-test
 
 .include "../../lang/python/pyversion.mk"
 
-.if ${PYPKGPREFIX} == "py26" || ${PYPKGPREFIX} == "py27" || ${PYPKGPREFIX} == "py33"
+.if ${PYPKGPREFIX} == "py27" || ${PYPKGPREFIX} == "py33"
 DEPENDS+=	${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34
 .endif
 
diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile
index 3ecdb50fe8b..c472f6c4754 100644
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2015/02/17 13:48:24 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2015/04/14 11:40:32 wiz Exp $
 
 DISTNAME=	dbus-1.8.16
 CATEGORIES=	sysutils
@@ -10,7 +10,6 @@ COMMENT=	Message bus system
 LICENSE=	gnu-gpl-v2
 
 CONFLICTS+=	dbus-glib<0.71
-CONFLICTS+=	py26-dbus<0.71
 CONFLICTS+=	py27-dbus<0.71
 
 GNU_CONFIGURE=		YES
diff --git a/www/py-tornado/Makefile b/www/py-tornado/Makefile
index c61c80e9137..03770f3b414 100644
--- a/www/py-tornado/Makefile
+++ b/www/py-tornado/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/02/08 16:31:48 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2015/04/14 11:40:32 wiz Exp $
 
 DISTNAME=	tornado-4.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -22,7 +22,7 @@ do-test:
 
 .include "../../lang/python/pyversion.mk"
 
-.if "${PYPKGPREFIX}" == "py26" || "${PYPKGPREFIX}" == "py27
+.if "${PYPKGPREFIX}" == "py27"
 DEPENDS+=	${PYPKGPREFIX}-backports.ssl_match_hostname-[0-9]*:../../security/py-backports.ssl_match_hostname
 .endif