[pkgsrc/trunk]: pkgsrc/lang/python Oops, forgot to commit these. Remove pyth...

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3adaac46aab8
branches:  trunk
changeset: 550806:3adaac46aab8
user:      snj <snj%pkgsrc.org@localhost>
date:      Sat Nov 29 18:52:22 2008 +0000

description:
Oops, forgot to commit these.  Remove python15 support.

diffstat:

 lang/python/pyversion.mk |  20 +++++---------------
 lang/python/srcdist.mk   |  12 +-----------
 2 files changed, 6 insertions(+), 26 deletions(-)

diffs (88 lines):

diff -r ac6126ec7b96 -r 3adaac46aab8 lang/python/pyversion.mk
--- a/lang/python/pyversion.mk  Sat Nov 29 18:13:28 2008 +0000
+++ b/lang/python/pyversion.mk  Sat Nov 29 18:52:22 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.59 2008/04/25 16:27:45 tnn Exp $
+# $NetBSD: pyversion.mk,v 1.60 2008/11/29 18:52:22 snj 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: 15 21 23 24 25
+#      Possible values: 21 23 24 25
 #      Default: 24
 #
 # === Package-settable variables ===
@@ -21,13 +21,13 @@
 #      PYTHON_VERSIONS_INCOMPATIBLE instead, since it will
 #      automatically include future versions.
 #
-#      Possible values: 25 24 23 21 15
+#      Possible values: 25 24 23 21
 #      Default: 25 24 23
 #
 # PYTHON_VERSIONS_INCOMPATIBLE
 #      The Python versions that are NOT acceptable for the package.
 #
-#      Possible values: 15 21 23 24 25
+#      Possible values: 21 23 24 25
 #      Default: (depends on the platform)
 #
 # PYTHON_FOR_BUILD_ONLY
@@ -66,10 +66,9 @@
 PYTHON_VERSIONS_INCOMPATIBLE?=         # empty by default
 
 .if ${OPSYS} == "Darwin"
-PYTHON_VERSIONS_INCOMPATIBLE+=         21 15
+PYTHON_VERSIONS_INCOMPATIBLE+=         21
 .endif
 
-BUILDLINK_API_DEPENDS.python15?=               python15>=1.5
 BUILDLINK_API_DEPENDS.python21?=               python21>=2.1
 BUILDLINK_API_DEPENDS.python23?=               python23>=2.3
 BUILDLINK_API_DEPENDS.python24?=               python24>=2.4
@@ -139,15 +138,6 @@
 PYDEPENDENCY=  ${BUILDLINK_API_DEPENDS.python21}:${PYPKGSRCDIR}
 PYVERSSUFFIX=  2.1
 PYPKGPREFIX=   py21
-.elif ${_PYTHON_VERSION} == "15"
-PYPKGSRCDIR=   ../../lang/python15
-PYPACKAGE=     python15
-PYDEPENDENCY=  ${BUILDLINK_API_DEPENDS.python15}:${PYPKGSRCDIR}
-PYVERSSUFFIX=  1.5
-PYPKGPREFIX=   py15
-.if !defined(PYTHON_DISTUTILS_BOOTSTRAP)
-BUILD_DEPENDS+=        py15-distutils-[0-9]*:../../devel/py-distutils
-.endif
 .else
 PKG_FAIL_REASON+=   "No valid Python version"
 .endif
diff -r ac6126ec7b96 -r 3adaac46aab8 lang/python/srcdist.mk
--- a/lang/python/srcdist.mk    Sat Nov 29 18:13:28 2008 +0000
+++ b/lang/python/srcdist.mk    Sat Nov 29 18:52:22 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: srcdist.mk,v 1.22 2008/04/25 16:11:11 tnn Exp $
+# $NetBSD: srcdist.mk,v 1.23 2008/11/29 18:52:22 snj Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -42,16 +42,6 @@
 WRKSRC=                ${WRKDIR}/${PYSUBDIR}
 MASTER_SITES=  ftp://ftp.python.org/pub/python/2.1.3/
 
-.elif ${_PYTHON_VERSION} == "15"
-
-DISTNAME=      py152
-EXTRACT_SUFX=  .tgz
-DISTINFO_FILE= ${.CURDIR}/../../lang/python15/distinfo
-PATCHDIR=      ${.CURDIR}/../../lang/python15/patches
-PYSUBDIR=      Python-1.5.2
-WRKSRC=                ${WRKDIR}/${PYSUBDIR}
-MASTER_SITES=  http://www.python.org/ftp/python/src/
-
 .endif
 
 .if defined(PYDISTUTILSPKG)