Remove python32 as proposed a week ago on pkgsrc-users.

Upstream doesn't talk about it any longer, and python-3.3 is a drop-in
replacement.
Ok bsiegert, prlw1, rodent

3 files changed, 11 insertions, 19 deletions

diff --git a/lang/python/egg.mk b/lang/python/egg.mk
index 88383187378..21ce605d152 100644
--- a/lang/python/egg.mk
+++ b/lang/python/egg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: egg.mk,v 1.15 2012/12/10 03:15:48 tsarna Exp $
+# $NetBSD: egg.mk,v 1.16 2014/01/12 09:01:50 wiz Exp $
 #
 # Common logic to handle Python Eggs
 #
@@ -36,7 +36,7 @@ _PYSETUPTOOLSINSTALLARGS=	--single-version-externally-managed
 _PYSETUPTOOLSINSTALLARGS+=	--root=/
 .endif
 
-.if ${_PYTHON_VERSION} == "31" || ${_PYTHON_VERSION} == "32" || ${_PYTHON_VERSION} == "33"
+.if ${_PYTHON_VERSION} == "33"
 DEPENDS+=	${PYPKGPREFIX}-distribute-[0-9]*:../../devel/py-distribute
 .else
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=0.6c9:../../devel/py-setuptools
diff --git a/lang/python/extension.mk b/lang/python/extension.mk
index dda64f21082..ebfbd201a24 100644
--- a/lang/python/extension.mk
+++ b/lang/python/extension.mk
@@ -1,4 +1,4 @@
-# $NetBSD: extension.mk,v 1.35 2013/11/10 13:05:54 obache Exp $
+# $NetBSD: extension.mk,v 1.36 2014/01/12 09:01:50 wiz Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -61,9 +61,9 @@ INSTALL_ENV+=		PKGSRC_PYTHON_NO_EGG=defined
 PLIST_SUBST+=	PYINC=${PYINC} PYLIB=${PYLIB} PYSITELIB=${PYSITELIB}
 .endif
 
-# prepare Python>=32 bytecode file location change
+# prepare Python>=3.2 bytecode file location change
 # http://www.python.org/dev/peps/pep-3147/
-.if empty(_PYTHON_VERSION:M2?) && ${_PYTHON_VERSION} != "31"
+.if empty(_PYTHON_VERSION:M2?)
 PY_PEP3147?=	yes
 .endif
 .if defined(PY_PEP3147) && !empty(PY_PEP3147:M[yY][eE][sS])
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk
index 2d4447e1c16..a48da079329 100644
--- a/lang/python/pyversion.mk
+++ b/lang/python/pyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.109 2013/05/12 00:19:55 riastradh Exp $
+# $NetBSD: pyversion.mk,v 1.110 2014/01/12 09:01:50 wiz Exp $
 
 # This file determines which Python version is used as a dependency for
 # a package.
@@ -8,7 +8,7 @@
 # PYTHON_VERSION_DEFAULT
 #	The preferred Python version to use.
 #
-#	Possible values: 26 27 32 33
+#	Possible values: 26 27 33
 #	Default: 27
 #
 # === Infrastructure variables ===
@@ -27,8 +27,8 @@
 #	order of the entries matters, since earlier entries are
 #	preferred over later ones.
 #
-#	Possible values: 33 32 27 26
-#	Default: (33 32) 27 26
+#	Possible values: 33 27 26
+#	Default: (33) 27 26
 #
 # PYTHON_VERSIONS_INCLUDE_3X
 #	Wether the default PYTHON_VERSIONS_ACCEPTED should include
@@ -41,7 +41,7 @@
 # PYTHON_VERSIONS_INCOMPATIBLE
 #	The Python versions that are NOT acceptable for the package.
 #
-#	Possible values: 26 27 32 33
+#	Possible values: 26 27 33
 #	Default: (depends on the platform)
 #
 # PYTHON_FOR_BUILD_ONLY
@@ -94,7 +94,7 @@ BUILD_DEFS_EFFECTS+=	PYPACKAGE
 
 PYTHON_VERSION_DEFAULT?=		27
 .if ${PYTHON_VERSIONS_INCLUDE_3X:U:tl} == "yes"
-PYTHON_VERSIONS_ACCEPTED?=		33 32 27 26
+PYTHON_VERSIONS_ACCEPTED?=		33 27 26
 .else
 PYTHON_VERSIONS_ACCEPTED?=		27 26
 .endif
@@ -102,7 +102,6 @@ PYTHON_VERSIONS_INCOMPATIBLE?=		# empty by default
 
 BUILDLINK_API_DEPENDS.python26?=		python26>=2.6
 BUILDLINK_API_DEPENDS.python27?=		python27>=2.7
-BUILDLINK_API_DEPENDS.python32?=		python32>=3.2
 BUILDLINK_API_DEPENDS.python33?=		python33>=3.3
 
 # transform the list into individual variables
@@ -166,13 +165,6 @@ PYPACKAGE=	python33
 PYVERSSUFFIX=	3.3
 PYPKGPREFIX=	py33
 PLIST.py3x=	yes
-.elif ${_PYTHON_VERSION} == "32"
-PYPKGSRCDIR=	../../lang/python32
-PYDEPENDENCY=	${BUILDLINK_API_DEPENDS.python32}:${PYPKGSRCDIR}
-PYPACKAGE=	python32
-PYVERSSUFFIX=	3.2
-PYPKGPREFIX=	py32
-PLIST.py3x=	yes
 .elif ${_PYTHON_VERSION} == "27"
 PYPKGSRCDIR=	../../lang/python27
 PYDEPENDENCY=	${BUILDLINK_API_DEPENDS.python27}:${PYPKGSRCDIR}