Import of pkgsrc-2015Q1

lang/python/distutils.mk

@@ -1,4 +1,4 @@
-# $NetBSD: distutils.mk,v 1.6 2012/04/23 13:02:06 obache Exp $
+# $NetBSD: distutils.mk,v 1.7 2014/12/31 13:57:28 wiz Exp $
 #
 # Common logic for python distributions that use distutils.
 #
@@ -19,7 +19,7 @@ PYDISTUTILSPKG=	yes
 # this norm and will work with all python versions.
 
 # Set the egg file basename.
-EGG_NAME?=	${DISTNAME}
+EGG_NAME?=	${DISTNAME:C/-([^0-9])/_\1/g}
 
 # Python distutils will create an eggfile.
 PY_NO_EGG?=	no

lang/python/egg.mk

@@ -1,4 +1,4 @@
-# $NetBSD: egg.mk,v 1.17 2014/01/26 00:41:07 wiz Exp $
+# $NetBSD: egg.mk,v 1.20 2014/12/31 13:57:28 wiz Exp $
 #
 # Common logic to handle Python Eggs
 #
@@ -9,7 +9,8 @@
 # use setuptools to create an egg.  Some distributions use distutils,
 # which creates an egg-info file; those should use distutils.mk
 
-EGG_NAME?=	${DISTNAME}
+EGG_NAME?=	${DISTNAME:C/-([^0-9])/_\1/g}
+EGG_INFODIR?=	${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
 
 PYDISTUTILSPKG=	yes
 PY_PATCHPLIST=	yes
@@ -20,12 +21,13 @@ PY_PATCHPLIST=	yes
 # the egg information in an egg comprises multiple files in an
 # egg-info directory.
 
-# XXX The PLIST substitution of EGG_NAME does not appear to be
-# necessary.  Either it should be removed or a comment added
-# explaining why it is necessary.
+# The PLIST substitution of EGG_NAME is not necessary. However, it
+# is convenient. See lang/ruby/gem.mk and PLIST files for ruby gem
+# packages to understand other examples of this feature in non-python
+# packages.
 
 PLIST_SUBST+=	EGG_NAME=${EGG_NAME}-py${PYVERSSUFFIX}
-PLIST_SUBST+=	EGG_INFODIR=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
+PLIST_SUBST+=	EGG_INFODIR=${EGG_INFODIR}
 PRINT_PLIST_AWK+=	{ gsub(/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/, \
 			       "$${EGG_INFODIR}") }
 PRINT_PLIST_AWK+=	{ gsub(/${EGG_NAME}-py${PYVERSSUFFIX}-nspkg.pth/, \
@@ -36,7 +38,7 @@ _PYSETUPTOOLSINSTALLARGS=	--single-version-externally-managed
 _PYSETUPTOOLSINSTALLARGS+=	--root=/
 .endif
 
-DEPENDS+=	${PYPKGPREFIX}-setuptools>=0.6c9:../../devel/py-setuptools
+DEPENDS+=	${PYPKGPREFIX}-setuptools>=0.8:../../devel/py-setuptools
 
 INSTALLATION_DIRS+=	${PYSITELIB}
 

lang/python/pyversion.mk

@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.113 2014/01/25 10:31:01 wiz Exp $
+# $NetBSD: pyversion.mk,v 1.116 2015/01/27 06:33:46 dbj 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 33
+#	Possible values: 26 27 33 34
 #	Default: 27
 #
 # === Infrastructure variables ===
@@ -27,13 +27,13 @@
 #	order of the entries matters, since earlier entries are
 #	preferred over later ones.
 #
-#	Possible values: 33 27 26
-#	Default: (33) 27 26
+#	Possible values: 34 33 27 26
+#	Default: 34 33 27 26
 #
 # PYTHON_VERSIONS_INCOMPATIBLE
 #	The Python versions that are NOT acceptable for the package.
 #
-#	Possible values: 26 27 33
+#	Possible values: 26 27 33 34
 #	Default: (empty)
 #
 # PYTHON_FOR_BUILD_ONLY
@@ -85,13 +85,9 @@ BUILD_DEFS+=		PYTHON_VERSION_DEFAULT
 BUILD_DEFS_EFFECTS+=	PYPACKAGE
 
 PYTHON_VERSION_DEFAULT?=		27
-PYTHON_VERSIONS_ACCEPTED?=		33 27 26
+PYTHON_VERSIONS_ACCEPTED?=		34 33 27 26
 PYTHON_VERSIONS_INCOMPATIBLE?=		# empty by default
 
-BUILDLINK_API_DEPENDS.python26?=		python26>=2.6
-BUILDLINK_API_DEPENDS.python27?=		python27>=2.7
-BUILDLINK_API_DEPENDS.python33?=		python33>=3.3
-
 # transform the list into individual variables
 .for pv in ${PYTHON_VERSIONS_ACCEPTED}
 .if empty(PYTHON_VERSIONS_INCOMPATIBLE:M${pv})
@@ -134,6 +130,7 @@ MULTI+=	PYTHON_VERSION_REQD=${_PYTHON_VERSION}
 # No supported version found, annotate to simplify statements below.
 .if !defined(_PYTHON_VERSION)
 _PYTHON_VERSION=	none
+PKG_FAIL_REASON+=	"No valid Python version"
 .endif
 
 # Additional CONFLICTS
@@ -146,30 +143,19 @@ CONFLICTS +=	${PKGNAME:S/py${_PYTHON_VERSION}/py${i}/:C/-[0-9].*$/-[0-9]*/}
 #
 PLIST_VARS+=	py2x py3x
 
-.if ${_PYTHON_VERSION} == "33"
-PYPKGSRCDIR=	../../lang/python33
-PYDEPENDENCY=	${BUILDLINK_API_DEPENDS.python33}:${PYPKGSRCDIR}
-PYPACKAGE=	python33
-PYVERSSUFFIX=	3.3
-PYPKGPREFIX=	py33
+.if empty(_PYTHON_VERSION:Mnone)
+PYPACKAGE=	python${_PYTHON_VERSION}
+PYVERSSUFFIX=	${_PYTHON_VERSION:C/^([0-9])/\1./1}
+BUILDLINK_API_DEPENDS.${PYPACKAGE}?=		${PYPACKAGE}>=${PYVERSSUFFIX}
+PYPKGSRCDIR=	../../lang/${PYPACKAGE}
+PYDEPENDENCY=	${BUILDLINK_API_DEPENDS.${PYPACKAGE}}:${PYPKGSRCDIR}
+PYPKGPREFIX=	py${_PYTHON_VERSION}
+.endif
+.if !empty(_PYTHON_VERSION:M3*)
 PLIST.py3x=	yes
-.elif ${_PYTHON_VERSION} == "27"
-PYPKGSRCDIR=	../../lang/python27
-PYDEPENDENCY=	${BUILDLINK_API_DEPENDS.python27}:${PYPKGSRCDIR}
-PYPACKAGE=	python27
-PYVERSSUFFIX=	2.7
-PYPKGPREFIX=	py27
+.endif
+.if !empty(_PYTHON_VERSION:M2*)
 PLIST.py2x=	yes
-.elif ${_PYTHON_VERSION} == "26"
-PYPKGSRCDIR=	../../lang/python26
-PYDEPENDENCY=	${BUILDLINK_API_DEPENDS.python26}:${PYPKGSRCDIR}
-PYPACKAGE=	python26
-PYVERSSUFFIX=	2.6
-PYPKGPREFIX=	py26
-PLIST.py2x=	yes
-.else
-PKG_FAIL_REASON+=   "No valid Python version"
-PYPKGPREFIX=
 .endif
 
 PTHREAD_OPTS+=	require
@@ -214,6 +200,11 @@ ALL_ENV+=	PYTHON=${PYTHONBIN}
 .if defined(USE_CMAKE)
 # used by FindPythonInterp.cmake and FindPythonLibs.cmake
 CMAKE_ARGS+=	-DPYVERSSUFFIX:STRING=${PYVERSSUFFIX}
+.if ${OPSYS} == "Darwin"
+# set this explicitly, as by default it will prefer the built in framework
+CMAKE_ARGS+=	-DPYTHON_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
+CMAKE_ARGS+=	-DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
+.endif
 .endif
 
 .endif	# PYTHON_PYVERSION_MK

lang/python/versioned_dependencies.mk

@@ -1,4 +1,4 @@
-# $NetBSD: versioned_dependencies.mk,v 1.11 2014/01/31 11:26:12 wiz Exp $
+# $NetBSD: versioned_dependencies.mk,v 1.18 2014/12/14 02:34:52 obache Exp $
 #
 # This file determines which separate distribution of a Python
 # package is used as dependency, depending on the Python version
@@ -17,14 +17,15 @@
 
 _SUPPORTED_PACKAGES=# empty
 _SUPPORTED_PACKAGES+=Pmw x11/py-Pmw x11/py-Pmw2
-_SUPPORTED_PACKAGES+=X x11/py-X2 x11/py-X
+_SUPPORTED_PACKAGES+=X textproc/py-X2 textproc/py-X
 _SUPPORTED_PACKAGES+=cairo graphics/py-cairo graphics/py-cairo3
-_SUPPORTED_PACKAGES+=dateutil time/py-dateutil time/py-dateutil2
+_SUPPORTED_PACKAGES+=dateutil time/py-dateutil time/py-dateutil
 _SUPPORTED_PACKAGES+=dns net/py-dns net/py-dns3
 _SUPPORTED_PACKAGES+=ephem math/py-ephem math/py-ephem3
 _SUPPORTED_PACKAGES+=flup www/py-flup www/py-flup3
+_SUPPORTED_PACKAGES+=google-api-python-client www/py-google-api-python-client www/py-google-api-python-client-py3
 _SUPPORTED_PACKAGES+=jsonlib textproc/py-jsonlib textproc/py-jsonlib3
-_SUPPORTED_PACKAGES+=unittest2 devel/py-unittest2 devel/py-unittest2py3k
+_SUPPORTED_PACKAGES+=python-digest www/py-python-digest www/py-python3-digest
 
 .for pattern in ${PYTHON_VERSIONED_DEPENDENCIES}
 _PKG_MATCHED=	no