update to 2.2

changes:
-new compressor called Blosc (speed-up)
-A new `tables.Expr` module (based on Numexpr) that allows to do
 persistent, on-disk computations on many algebraic operations.
-Support for HDF5 hard links, soft links and automatic external links
-Suport for 'fancy' indexing
-bugfixes

4 files changed, 34 insertions, 37 deletions

diff --git a/math/py-pytables/Makefile b/math/py-pytables/Makefile
index 1923e6596bf..8b3835a0c99 100644
--- a/math/py-pytables/Makefile
+++ b/math/py-pytables/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2009/11/15 15:56:55 drochner Exp $
+# $NetBSD: Makefile,v 1.18 2010/07/16 12:17:59 drochner Exp $
 #
 
-DISTNAME=		tables-2.1.2
-PKGNAME=		${PYPKGPREFIX}-pytables-2.1.2
+DISTNAME=		tables-2.2
+PKGNAME=		${PYPKGPREFIX}-pytables-2.2
 CATEGORIES=		math python
-MASTER_SITES=		http://www.pytables.org/download/pytables-2.1.2/
+MASTER_SITES=		http://www.pytables.org/download/pytables-2.2/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.pytables.org/
@@ -40,4 +40,6 @@ do-test:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
+.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 ab312c4fb7b..20908f89acd 100644
--- a/math/py-pytables/PLIST
+++ b/math/py-pytables/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/12/16 16:59:48 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/07/16 12:17:59 drochner Exp $
 bin/nctoh5${PYVERSSUFFIX}
 bin/ptdump${PYVERSSUFFIX}
 bin/ptrepack${PYVERSSUFFIX}
@@ -40,6 +40,9 @@ ${PYSITELIB}/tables/earray.pyo
 ${PYSITELIB}/tables/exceptions.py
 ${PYSITELIB}/tables/exceptions.pyc
 ${PYSITELIB}/tables/exceptions.pyo
+${PYSITELIB}/tables/expression.py
+${PYSITELIB}/tables/expression.pyc
+${PYSITELIB}/tables/expression.pyo
 ${PYSITELIB}/tables/file.py
 ${PYSITELIB}/tables/file.pyc
 ${PYSITELIB}/tables/file.pyo
@@ -56,6 +59,10 @@ ${PYSITELIB}/tables/hdf5Extension.so
 ${PYSITELIB}/tables/leaf.py
 ${PYSITELIB}/tables/leaf.pyc
 ${PYSITELIB}/tables/leaf.pyo
+${PYSITELIB}/tables/link.py
+${PYSITELIB}/tables/link.pyc
+${PYSITELIB}/tables/link.pyo
+${PYSITELIB}/tables/linkExtension.so
 ${PYSITELIB}/tables/misc/__init__.py
 ${PYSITELIB}/tables/misc/__init__.pyc
 ${PYSITELIB}/tables/misc/__init__.pyo
@@ -122,28 +129,6 @@ ${PYSITELIB}/tables/nra/tests/test_nestedrecords.pyo
 ${PYSITELIB}/tables/nra/tests/test_nriterators.py
 ${PYSITELIB}/tables/nra/tests/test_nriterators.pyc
 ${PYSITELIB}/tables/nra/tests/test_nriterators.pyo
-${PYSITELIB}/tables/numexpr/__init__.py
-${PYSITELIB}/tables/numexpr/__init__.pyc
-${PYSITELIB}/tables/numexpr/__init__.pyo
-${PYSITELIB}/tables/numexpr/compiler.py
-${PYSITELIB}/tables/numexpr/compiler.pyc
-${PYSITELIB}/tables/numexpr/compiler.pyo
-${PYSITELIB}/tables/numexpr/expressions.py
-${PYSITELIB}/tables/numexpr/expressions.pyc
-${PYSITELIB}/tables/numexpr/expressions.pyo
-${PYSITELIB}/tables/numexpr/info.py
-${PYSITELIB}/tables/numexpr/info.pyc
-${PYSITELIB}/tables/numexpr/info.pyo
-${PYSITELIB}/tables/numexpr/interpreter.so
-${PYSITELIB}/tables/numexpr/setup.py
-${PYSITELIB}/tables/numexpr/setup.pyc
-${PYSITELIB}/tables/numexpr/setup.pyo
-${PYSITELIB}/tables/numexpr/tests/__init__.py
-${PYSITELIB}/tables/numexpr/tests/__init__.pyc
-${PYSITELIB}/tables/numexpr/tests/__init__.pyo
-${PYSITELIB}/tables/numexpr/tests/test_numexpr.py
-${PYSITELIB}/tables/numexpr/tests/test_numexpr.pyc
-${PYSITELIB}/tables/numexpr/tests/test_numexpr.pyo
 ${PYSITELIB}/tables/parameters.py
 ${PYSITELIB}/tables/parameters.pyc
 ${PYSITELIB}/tables/parameters.pyo
@@ -174,20 +159,24 @@ ${PYSITELIB}/tables/tests/Tables_lzo2_shuffle.h5
 ${PYSITELIB}/tables/tests/__init__.py
 ${PYSITELIB}/tables/tests/__init__.pyc
 ${PYSITELIB}/tables/tests/__init__.pyo
+${PYSITELIB}/tables/tests/array_mdatom.h5
 ${PYSITELIB}/tables/tests/attr-u16.h5
+${PYSITELIB}/tables/tests/blosc_bigendian.h5
 ${PYSITELIB}/tables/tests/check_leaks.py
 ${PYSITELIB}/tables/tests/check_leaks.pyc
 ${PYSITELIB}/tables/tests/check_leaks.pyo
 ${PYSITELIB}/tables/tests/common.py
 ${PYSITELIB}/tables/tests/common.pyc
 ${PYSITELIB}/tables/tests/common.pyo
+${PYSITELIB}/tables/tests/elink.h5
+${PYSITELIB}/tables/tests/elink2.h5
 ${PYSITELIB}/tables/tests/ex-noattr.h5
 ${PYSITELIB}/tables/tests/flavored_vlarrays-format1.6.h5
 ${PYSITELIB}/tables/tests/idx-std-1.x.h5
 ${PYSITELIB}/tables/tests/indexes_2_0.h5
 ${PYSITELIB}/tables/tests/nested-type-with-gaps.h5
 ${PYSITELIB}/tables/tests/non-chunked-table.h5
-${PYSITELIB}/tables/tests/old-flavors.h5
+${PYSITELIB}/tables/tests/slink.h5
 ${PYSITELIB}/tables/tests/smpl_SDSextendible.h5
 ${PYSITELIB}/tables/tests/smpl_compound_chunked.h5
 ${PYSITELIB}/tables/tests/smpl_enum.h5
@@ -231,6 +220,9 @@ ${PYSITELIB}/tables/tests/test_earray.pyo
 ${PYSITELIB}/tables/tests/test_enum.py
 ${PYSITELIB}/tables/tests/test_enum.pyc
 ${PYSITELIB}/tables/tests/test_enum.pyo
+${PYSITELIB}/tables/tests/test_expression.py
+${PYSITELIB}/tables/tests/test_expression.pyc
+${PYSITELIB}/tables/tests/test_expression.pyo
 ${PYSITELIB}/tables/tests/test_garbage.py
 ${PYSITELIB}/tables/tests/test_garbage.pyc
 ${PYSITELIB}/tables/tests/test_garbage.pyo
@@ -240,6 +232,9 @@ ${PYSITELIB}/tables/tests/test_hdf5compat.pyo
 ${PYSITELIB}/tables/tests/test_index_backcompat.py
 ${PYSITELIB}/tables/tests/test_index_backcompat.pyc
 ${PYSITELIB}/tables/tests/test_index_backcompat.pyo
+${PYSITELIB}/tables/tests/test_links.py
+${PYSITELIB}/tables/tests/test_links.pyc
+${PYSITELIB}/tables/tests/test_links.pyo
 ${PYSITELIB}/tables/tests/test_lists.py
 ${PYSITELIB}/tables/tests/test_lists.pyc
 ${PYSITELIB}/tables/tests/test_lists.pyo
diff --git a/math/py-pytables/distinfo b/math/py-pytables/distinfo
index a4d562ef0e9..2fd1ea50cd2 100644
--- a/math/py-pytables/distinfo
+++ b/math/py-pytables/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2009/11/15 15:56:55 drochner Exp $
+$NetBSD: distinfo,v 1.8 2010/07/16 12:17:59 drochner Exp $
 
-SHA1 (tables-2.1.2.tar.gz) = 545cc16491d37e2f6b8ce10bc8bdfa559b174e2e
-RMD160 (tables-2.1.2.tar.gz) = 09bfb73e9252baa34aa40274a0b07f6c6cc60d70
-Size (tables-2.1.2.tar.gz) = 4677233 bytes
-SHA1 (patch-aa) = 3cf2812635aaa12e445398243ca765d209fb9cdf
+SHA1 (tables-2.2.tar.gz) = 1a1c3e01b99fb264ae5fce1fa2950c25e6dcb516
+RMD160 (tables-2.2.tar.gz) = 6a15629c6d08131589e1825d1a237f2d5c887aab
+Size (tables-2.2.tar.gz) = 4700399 bytes
+SHA1 (patch-aa) = 8d89466c9fc4df63dd39a3fe2bd3e9f8ac7b45c8
diff --git a/math/py-pytables/patches/patch-aa b/math/py-pytables/patches/patch-aa
index d9e97d7e16b..bc61145fcc8 100644
--- a/math/py-pytables/patches/patch-aa
+++ b/math/py-pytables/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.6 2009/11/15 15:56:55 drochner Exp $
+$NetBSD: patch-aa,v 1.7 2010/07/16 12:18:00 drochner Exp $
 
---- setup.py.orig	2009-03-05 18:12:19.000000000 +0100
+--- setup.py.orig	2010-07-01 11:04:59.000000000 +0000
 +++ setup.py
-@@ -463,7 +463,7 @@ else:
-         'tables.tests', 'tables.numexpr.tests', 'tables.nodes.tests',
+@@ -527,7 +527,7 @@ else:
+         'tables.tests', 'tables.nodes.tests',
          'tables.netcdf3.tests', 'tables.nra.tests']
      setuptools_kwargs['scripts'] = [
 -        'utils/ptdump', 'utils/ptrepack', 'utils/nctoh5']