Import of pkgsrc-2016Q3

math/py-numexpr/Makefile

@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2014/07/19 12:46:53 bad Exp $
+# $NetBSD: Makefile,v 1.6 2016/07/15 07:18:45 wiz Exp $
 
-DISTNAME=	numexpr-2.2.2
+DISTNAME=	numexpr-2.6.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
-MASTER_SITES=	http://numexpr.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=pydata/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
+GITHUB_PROJECT=	numexpr
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://code.google.com/p/numexpr/
+HOMEPAGE=	https://github.com/pydata/numexpr
 COMMENT=	Numerical expression evaluator for NumPy
 LICENSE=	mit
 

math/py-numexpr/PLIST

@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2014/07/19 12:46:53 bad Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/07/15 07:18:45 wiz Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/numexpr/__config__.py
 ${PYSITELIB}/numexpr/__config__.pyc

math/py-numexpr/buildlink3.mk

@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/07/16 12:12:17 drochner Exp $
-
-BUILDLINK_TREE+=	pynumexpr
-
-.if !defined(PY_NUMEXPR_BUILDLINK3_MK)
-PY_NUMEXPR_BUILDLINK3_MK:=
-
-.include "../../lang/python/pyversion.mk"
-
-BUILDLINK_API_DEPENDS.pynumexpr+= ${PYPKGPREFIX}-numexpr>=1.3.1
-BUILDLINK_PKGSRCDIR.pynumexpr?=	../../math/py-numexpr
-
-.endif # PY_NUMEXPR_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-pynumexpr

math/py-numexpr/distinfo

@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2014/01/21 13:26:52 wiz Exp $
+$NetBSD: distinfo,v 1.6 2016/07/15 07:21:36 wiz Exp $
 
-SHA1 (numexpr-2.2.2.tar.gz) = 021cbd31e6976164b4b956318b30630dabd16159
-RMD160 (numexpr-2.2.2.tar.gz) = 683d7d88f305b18e8538bdaca000f46fdf02b1ee
-Size (numexpr-2.2.2.tar.gz) = 75680 bytes
-SHA1 (patch-ab) = 8d7c58654228b9961169bde5c74cc9bd22ed7fa4
+SHA1 (numexpr-2.6.0.tar.gz) = 02b80e27878853e65ccc8884f1d83d9fdc017abf
+RMD160 (numexpr-2.6.0.tar.gz) = 0b02d07304e38b06ae83cc43cbacd1a99910c1c2
+SHA512 (numexpr-2.6.0.tar.gz) = 6712901e3be20a44d4f40e57fc09bcae17ab0a6af1caf5bc63dd66ca751875b74af71e0f016386b7e68d52ef34a2bab226e3a79871eea35754ddbfe143b5a68e
+Size (numexpr-2.6.0.tar.gz) = 99103 bytes
+SHA1 (patch-ab) = cb007f2e1bf6d52cd5363c2194a905c77f3e911f

math/py-numexpr/patches/patch-ab

@@ -1,9 +1,12 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/07/16 12:12:17 drochner Exp $
+$NetBSD: patch-ab,v 1.3 2016/07/15 07:21:36 wiz Exp $
 
---- numexpr/cpuinfo.py.orig	2009-06-23 08:39:40.000000000 +0000
+Add NetBSD support in CPU detection.
+https://github.com/pydata/numexpr/pull/223
+
+--- numexpr/cpuinfo.py.orig	2016-06-01 11:55:58.000000000 +0000
 +++ numexpr/cpuinfo.py
-@@ -390,6 +390,30 @@ class DarwinCPUInfo(CPUInfoBase):
-     def _is_ppc823(self): return self.__machine(823)
+@@ -498,6 +498,32 @@ class DarwinCPUInfo(CPUInfoBase):
+ 
      def _is_ppc860(self): return self.__machine(860)
  
 +class NetBSDCPUInfo(CPUInfoBase):
@@ -12,8 +15,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2010/07/16 12:12:17 drochner Exp $
 +	def __init__(self):
 +		if self.info is not None:
 +			return
-+		info = command_info(arch='arch', machine='machine')
-+		info['sysctl_hw'] = key_value_from_command('sysctl hw', sep='=')
++		info = {}
++		info['sysctl_hw'] = key_value_from_command(['sysctl', 'hw'], sep='=')
++		info['arch'] = info['sysctl_hw'].get('hw.machine_arch', 1)
++		info['machine'] = info['sysctl_hw'].get('hw.machine', 1)
 +		self.__class__.info = info
 +
 +	def _not_impl(self): pass
@@ -32,8 +37,8 @@ $NetBSD: patch-ab,v 1.1.1.1 2010/07/16 12:12:17 drochner Exp $
 +		return False
  
  class SunOSCPUInfo(CPUInfoBase):
- 
-@@ -648,6 +672,8 @@ elif sys.platform.startswith('irix'):
+     info = None
+@@ -781,6 +807,8 @@ elif sys.platform.startswith('irix'):
      cpuinfo = IRIXCPUInfo
  elif sys.platform == 'darwin':
      cpuinfo = DarwinCPUInfo