update to 2.2.1

changes:
-misc fixes and feature additions
-space saving / time improvements
-needs py-cython-0.13

4 files changed, 29 insertions, 9 deletions

diff --git a/math/py-pytables/Makefile b/math/py-pytables/Makefile
index ebf41ead30b..6dea4d42259 100644
--- a/math/py-pytables/Makefile
+++ b/math/py-pytables/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2010/07/17 18:13:08 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2010/11/24 18:06:01 drochner Exp $
 #
 
-DISTNAME=		tables-2.2
-PKGNAME=		${PYPKGPREFIX}-pytables-2.2
+DISTNAME=		tables-2.2.1
+PKGNAME=		${PYPKGPREFIX}-pytables-2.2.1
 CATEGORIES=		math python
-MASTER_SITES=		http://www.pytables.org/download/pytables-2.2/
+MASTER_SITES=		http://www.pytables.org/download/pytables-2.2.1/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.pytables.org/
@@ -42,6 +42,7 @@ do-test:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
+BUILDLINK_API_DEPENDS.pycython+= ${PYPKGPREFIX}-cython>=0.13
 .include "../../devel/py-cython/buildlink3.mk"
 .include "../../math/py-numexpr/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-pytables/PLIST b/math/py-pytables/PLIST
index 20908f89acd..c91c14a9797 100644
--- a/math/py-pytables/PLIST
+++ b/math/py-pytables/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2010/07/16 12:17:59 drochner Exp $
+@comment $NetBSD: PLIST,v 1.9 2010/11/24 18:06:01 drochner Exp $
 bin/nctoh5${PYVERSSUFFIX}
 bin/ptdump${PYVERSSUFFIX}
 bin/ptrepack${PYVERSSUFFIX}
@@ -138,6 +138,9 @@ ${PYSITELIB}/tables/path.pyo
 ${PYSITELIB}/tables/registry.py
 ${PYSITELIB}/tables/registry.pyc
 ${PYSITELIB}/tables/registry.pyo
+${PYSITELIB}/tables/req_versions.py
+${PYSITELIB}/tables/req_versions.pyc
+${PYSITELIB}/tables/req_versions.pyo
 ${PYSITELIB}/tables/scripts/__init__.py
 ${PYSITELIB}/tables/scripts/__init__.pyc
 ${PYSITELIB}/tables/scripts/__init__.pyo
diff --git a/math/py-pytables/distinfo b/math/py-pytables/distinfo
index 2fd1ea50cd2..fb76b7831cc 100644
--- a/math/py-pytables/distinfo
+++ b/math/py-pytables/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2010/07/16 12:17:59 drochner Exp $
+$NetBSD: distinfo,v 1.9 2010/11/24 18:06:01 drochner Exp $
 
-SHA1 (tables-2.2.tar.gz) = 1a1c3e01b99fb264ae5fce1fa2950c25e6dcb516
-RMD160 (tables-2.2.tar.gz) = 6a15629c6d08131589e1825d1a237f2d5c887aab
-Size (tables-2.2.tar.gz) = 4700399 bytes
+SHA1 (tables-2.2.1.tar.gz) = 2c6385365be19fdf8f81e8fd862bedfcf4fe2ba5
+RMD160 (tables-2.2.1.tar.gz) = 1d9ab1f836fcccccdad8eee7603a1056c2c27716
+Size (tables-2.2.1.tar.gz) = 4985175 bytes
 SHA1 (patch-aa) = 8d89466c9fc4df63dd39a3fe2bd3e9f8ac7b45c8
+SHA1 (patch-ab) = 4bae646f86c7cf0e96b143fa09fae8c6e57508a9
diff --git a/math/py-pytables/patches/patch-ab b/math/py-pytables/patches/patch-ab
new file mode 100644
index 00000000000..6b7aa764113
--- /dev/null
+++ b/math/py-pytables/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.3 2010/11/24 18:06:01 drochner Exp $
+
+avoid use of a rendundant Python-2.6 builtin for compatibility
+
+--- tables/tests/test_basics.py.orig	2010-11-05 09:27:14.000000000 +0000
++++ tables/tests/test_basics.py
+@@ -2243,7 +2243,7 @@ def _worker(fn, qout = None):
+     rows = fp.root.table.where('(f0 < 10)')
+     if common.verbose:
+         print "Got the iterator, about to iterate"
+-    row = next(rows)
++    row = rows.next()
+     if common.verbose:
+         print "Succeeded in one iteration\n"
+     fp.close()