Version Bump and fix compilation/linking against dev-libs/c-blosc, bug #547200 & bug #549514

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

6 files changed, 212 insertions, 18 deletions

diff --git a/dev-python/pytables/ChangeLog b/dev-python/pytables/ChangeLog
index a3ff5387fb22..5a15b4810e73 100644
--- a/dev-python/pytables/ChangeLog
+++ b/dev-python/pytables/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/pytables
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytables/ChangeLog,v 1.59 2015/04/07 14:18:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytables/ChangeLog,v 1.60 2015/05/15 09:58:58 jlec Exp $
+
+*pytables-3.2.0 (15 May 2015)
+*pytables-3.1.1-r2 (15 May 2015)
+
+  15 May 2015; Justin Lecher <jlec@gentoo.org>
+  +files/pytables-3.1.1-blosc.patch, +files/pytables-3.2.0-blosc.patch,
+  +pytables-3.1.1-r2.ebuild, +pytables-3.2.0.ebuild:
+  Version Bump and fix compilation/linking against dev-libs/c-blosc, bug #547200
+  & bug #549514
 
   17 Feb 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Drop unused local USE descr.
diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest
index 3c04aed8e2b7..2b47f6c5fb5c 100644
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@@ -1,28 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX pytables-3.1.1-blosc.patch 418 SHA256 b91909a1e9f2e91b62e24e2afa3d7d686212f39747aa3f84b0cef623a92a75d7 SHA512 fa60a3a5c60faa07b64fa5f0241e8d81a4c86287b86808cd39a5a861f5de91d6c83da7d774c25643e2591e8a04731f10c6b188a6854a9bf4c0bea7a94d51ac35 WHIRLPOOL 2bb4c45564cf91595cc8c8cb8ef131af9d01323dea147b21bb06099a5c197d4532e9928b55d78e20355795f35db67383859dfadb316f510f9645641a8fa601a6
 AUX pytables-3.1.1-cython-backport.patch 2472 SHA256 3c7441ef6cbe36e5cc4e4947af832a9d591db027819b4f2745e932d58bd70511 SHA512 c8f235ab3765410e4c0e488e30e00050d6bbc0f8b6874d4e794fc5edf69ad1877c4290a35c111d44a5626c567bc4fff35213ee6b3005a6bb25d5879489c49a63 WHIRLPOOL 1d5f9eb91af30a1b5e09eb023d3869b37bf983b5a8e1e499559da75a5af55f0ae166f92df4d4966365d1510ad67edd5e6b06a8454ae75d41cad405c7d679696d
 AUX pytables-3.1.1-numpy19-backport.patch 1636 SHA256 9b18bf3ceae99ec4dada2842cb4fc31cfa3dc345103315a6aba233bb8fbe3e36 SHA512 6553229186b6007b67f79c63cf4bcb168f7fe77c62478fcfa29bb27402decb30ec36a2df4f0794bab19d7fb7d77dcd5072caaa88ae2a7aa4025608f610efde75 WHIRLPOOL 73dd5745049571cf4c515feda70f1602fbe6d98b658bc6b6eca030a165be0d3bbd89ca3cb8a8789e8ca0c603b8ff6c8f9a45f75a8c18e70c30e3961ad54f267b
+AUX pytables-3.2.0-blosc.patch 378 SHA256 77d260d82666e2eb6b91c24ad5f946fe8440a1a118fec0520f0e2d6c9a7c9e90 SHA512 eeeef9b57f4cca4487108aabeade2e604ac88c5352e10755df6e6c24613a1ff0b1ca20fc2f73de10b6b69c912b88d5e335000dd5eb9cff4f9016cfd1d692520f WHIRLPOOL 0582c1dfcf355f319844c53c2997b07fbd9509a7a1421dd9c714a11e6678fc5d80b7c1295af6c6565a29389177e471b8d945a1afdaa9afe8090aaea189d77e4a
 DIST tables-3.1.1.tar.gz 6715786 SHA256 39b9036376f1185599771c19276f13b5b9119d98f9108f58595745ded3fe2da3 SHA512 b5b2052dd81c4748c5e26c1f61f9f92891f48335b0a553f7602ab11c9029dd673d27b91e24cac0da21a81df0c26dbcd9a438214fa58af1ae831c5f04dfa212a6 WHIRLPOOL 86fd6dc9e12503fdbd23013b75f33a41eadbbac0e6dd5ac9a91476d073195077fc6b3d5ad24b1dd4b4c18ae7ed8abc8ea1708262e52240f4c2c3b1153f8c9e91
+DIST tables-3.2.0.tar.gz 7039718 SHA256 60980e44676bfe463cdd2582ecdacc0b0763b259477015e866f8af72b4cdba44 SHA512 6ef7925bafbec04a3f581d13e9cc266b9b68b11dce27cf28c501dbbc538d74ddcfa15cbe97fa69fb793911cc6dbf3112f503b29c6e4e3e7631a6761cc1303253 WHIRLPOOL 412ada055b81fd7409b67288bc2bcf9ed527c9c42dbdd75c52ce7287f53ed12322b8b4423c9fab0aba98e0f12a8764a45316104567c193b469a84fdda3cbfc30
 EBUILD pytables-3.1.1-r1.ebuild 1598 SHA256 d81f8cdb8cf67a61cca333e451681da6cb4367c0fca615f554da346f74b70228 SHA512 80d71fe57c9328224b4fd2e51c70cd5a0ebe9e217f83e0b9cb02b1da09096c5cd13e6e80dc73122d2b2b10209c3e513914c381dc89408a87d5c7465483a12ab0 WHIRLPOOL ab40c81467ee41caf5fe3f0c7f5f3793a29fb25cc3cc5c12eee4ed9e33ad58031b2aac78701af790d8ef8b7ec554d8ae2e2bcc57de1d1e0aefe4690937727a96
-MISC ChangeLog 8807 SHA256 2ad431d86ff5e5dcc8016d539316647da177d1debe034516357894fae0db1691 SHA512 f67b1d5fd48ad25a1fe47a2663f5c19ec0f5578263d1fc9f7ef81ebe90d35d2dcef99b948e008260dcbcf49d627be318368e369d8f5af7e156c5ebe22ceb3372 WHIRLPOOL 14b7658cf803feed7c0115a8b117906effa81b1ee8f393a45c3f20e123ff1fe6e32666dfdded62cbbeed388abf3ef68e25f2e79cfb9f277e5f47e6095e39522f
+EBUILD pytables-3.1.1-r2.ebuild 1698 SHA256 cbf08c706b7ece2049c7ce982eb4d9be0ef9af4c3a7801fd4c283e33db0a3074 SHA512 06a00c58b1a5b68af080ad198d1a833bd2bcaba9a41067061ae2b6bc9f28df7a97691996791c0d08607ee8e786b7d44d859183ff58f9180cd4a7a4a3afe1c8bc WHIRLPOOL 31f1142f4a12112aa556c0fd1464c441d4f46f3a79200303f9fcfca40e5e08b1ee09773702437b832b3bd8b03b499b6d4913a906cfedf9df70c968f808bbf68e
+EBUILD pytables-3.2.0.ebuild 1632 SHA256 359ea1271a8037921ec79311075771f6caecb59cf58e80e5c82e3b412d3d0eab SHA512 18082ed00dcca22a5476724d6d80bb2add7e627337696c5add6a534053e767748d49026f25d88fdc44e736766406d1597e9e1dc77575aadb311302ae97ca9e3e WHIRLPOOL 7e51dd8d4c1bc3b5f37f20ef492458ee2046bf2f56be5bb662bc8dd43f0666795e4122891c7fdc058b9812e833b487dd1bee3a3affde71cbb93c39d19b5ab091
+MISC ChangeLog 9141 SHA256 7bfc5c360113e12c4c7506dcfe157b0b93e87dea58422b5364ce8e5ec176cecd SHA512 3235cb57e2735b77406b8f5bf23a77ace5bd52073e95128cdbb363503648411b588a91f13ede9853f1eeb974e13483452cc9fc3c21d4657ca321b1e86136d08d WHIRLPOOL fd70a89928f0bb908373cdedbbedc8c99f04772cc02b73015161d82a948bcad1e25aaee3378ddf5ba7d98a7b988022bf43ee9067342c1a0def9c72649467f97a
 MISC metadata.xml 708 SHA256 b90f6096e9d39e35df155105b0f596adbec91e2db072feca95fa1dcf563f3ea0 SHA512 4037ae41f46370e68835837c21ad365d8676cdb746205044d88822768fc8c7a312102fe847d2e346e1916883920c0144badc2b43f6898cf9ccbe7b23f0b146cf WHIRLPOOL 5648595d269f9da8208769c6112cec089860ae5de8cb1f7a8d6884c12f82a64908d17751814e68733ad2701253beabc7af918123676c6cdb9ea1a4369c290f94
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVI+ciXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirKuUQAJKjYwYlY4RGLthZJqSYnvc5
-Abvtjd5NnMpEJQq0u56Ft/2iq8cG6hT/bbezMAhsT9KDW1EwpxOslbgQ+Nw4EKTC
-yEc3XoJ+VSXJ1zQbWZvy8JL06Xg681xKxZ8tYfcTrLfE5tj6c2xRTf78AKRtkp1S
-o1Ky9BKEIhfVC0ldTI6f8VDLLvxMXgaDTu2Nyc61D7Q6MEZ6w269rL5/SOLC5n3V
-g9a2QC/4PBKZgEv7HcHcyhzsySrZf50S1BQA8vzTRg/W/B2Pcda/J2OuBIpQ9A2L
-aIHwaJsDKG8mlfzc+t1pk3qfAdeg2k0advPVsaEkQBnrP4iB7fZE2QBON8jnfPo2
-rUBPF8o0fBWNThIAuWfddtJqu1jpV/dZxoqIdsnLTYjBWztHV7SWTsZP8lJHfqft
-EDU4u3bEbiIJ2B5t+4d8+Wi92uF1ESAgindPHnBl8DG8ZjVe6sYMckr9H08xNrjc
-twYhOjPXmywNXUjM2Z4kFpDAIMEX9OxMQDM/490xi8PYfCkkUwRyA2RHQn9r0Nld
-B8eTQd9fGQVvYB7r6TRJArt5co4Kg7hSAXJ3xV9gcW2XYb3AUYKLEDlyQn1buI5Z
-ZA+JE6Hh6Tuq+n/tQl1RIFFHoRsCRk01X1rO2zduwfWR7Mg2htekpraPMiT0dI4d
-FjHcGwVJa68tzWFa8Qlj
-=U1zA
+iQJ8BAEBCgBmBQJVVcNjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmifLMP/349w+Xf1QmMI1ZcgR8G8CfG
+LmgL0OhO/4ByCwqA78ozB79XbjE8aOZ3e8dHTpue7WYkAFRepcwkm8DLVUVFsgoX
+XmYxjZviSaS/3g3ihdGV7EFb2PDsWlGlYj3elnShDzxz3uQEYZNzw6WC3jCQlqq3
+/bXAgvuRAljX1ZOpAR3afkTS2lCWEiUEFyvmKKrgCoywC1aU0I1JXggyKSV8URd+
+OSiorTHbpOQ7GfFfpWrF7O/bSKY5JtuOPGYcQOe1/vnfZRLl3Adt3aVKFNDx3Wgw
+YwR3w102289OEaaTlwHjwka6hO9+EE9qWcGW/td6811m/r/XIRptKJmTI54a0VIm
+cQdxYjxBDRoT+5A9/bBsWytHIsZv956LTq9FtzziWD50wAtjyxHwruB6QuFQwKK7
+TK4EfQMee5MisSWJrUEMcLswfD/IbfrELZQKaC3401TQfxvlN5ttnWQM5Chadr81
+0M5jJiXLsKk68Bz7E5oHE4MqIsnSe1Gqhx/pVNrqKEh+8MhhNoqHWQ57uZNx45ma
+ny9lpCaffSGy+bu4BQUZzpKu6a08UeqxHskZlH/0pycdqfFRs07Ceth9TJJCy84h
+XuWPTBRLJn10Fxf9Kzka3LZ0PDPSZ/+6snGt2dRwKkrQwE9irNRyiWVVy1hzohDg
+GlopDR2c2/aH6yjA1tZt
+=oJSR
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pytables/files/pytables-3.1.1-blosc.patch b/dev-python/pytables/files/pytables-3.1.1-blosc.patch
new file mode 100644
index 000000000000..3a4ba18e5e73
--- /dev/null
+++ b/dev-python/pytables/files/pytables-3.1.1-blosc.patch
@@ -0,0 +1,16 @@
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 2c0c126..1448eb1 100755
+--- a/setup.py
++++ b/setup.py
+@@ -768,7 +768,7 @@ if 'BLOSC' not in optional_libs:
+             print("Setting compiler flag '-msse2'")
+             CFLAGS.append("-msse2")
+ else:
+-    ADDLIBS += ['blosc']
++    ADDLIBS += ['blosc', 'blosc_filter']
+ 
+ 
+ utilsExtension_libs = LIBS + ADDLIBS
diff --git a/dev-python/pytables/files/pytables-3.2.0-blosc.patch b/dev-python/pytables/files/pytables-3.2.0-blosc.patch
new file mode 100644
index 000000000000..24c58c1a921c
--- /dev/null
+++ b/dev-python/pytables/files/pytables-3.2.0-blosc.patch
@@ -0,0 +1,16 @@
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 2c0c126..1448eb1 100755
+--- a/setup.py
++++ b/setup.py
+@@ -768,7 +768,7 @@ if 'BLOSC' not in optional_libs:
+             CFLAGS.append(ff)
+             break
+ else:
+-    ADDLIBS += ['blosc']
++    ADDLIBS += ['blosc', 'blosc_filter']
+ 
+ 
+ utilsExtension_libs = LIBS + ADDLIBS
diff --git a/dev-python/pytables/pytables-3.1.1-r2.ebuild b/dev-python/pytables/pytables-3.1.1-r2.ebuild
new file mode 100644
index 000000000000..01eef7e08e9e
--- /dev/null
+++ b/dev-python/pytables/pytables-3.1.1-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytables/pytables-3.1.1-r2.ebuild,v 1.1 2015/05/15 09:58:58 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+MY_PN=tables
+MY_P=${MY_PN}-${PV}
+
+inherit distutils-r1
+
+DESCRIPTION="Hierarchical datasets for Python"
+HOMEPAGE="http://www.pytables.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD"
+IUSE="doc examples"
+
+RDEPEND="
+	app-arch/bzip2:0=
+	dev-libs/c-blosc:0=[hdf5]
+	dev-libs/lzo:2=
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/numexpr[${PYTHON_USEDEP}]
+	sci-libs/hdf5:0="
+DEPEND="${RDEPEND}
+	>=dev-python/cython-0.14[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( ANNOUNCE.txt RELEASE_NOTES.txt THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cython-backport.patch
+	"${FILESDIR}"/${P}-numpy19-backport.patch
+	"${FILESDIR}"/${P}-blosc.patch
+	)
+
+python_prepare_all() {
+	export HDF5_DIR="${EPREFIX}"/usr
+	sed \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		-e 's:"c-blosc/hdf5/blosc_filter.c"::g' \
+		-i setup.py || die
+	rm -r c-blosc/{blosc,hdf5,internal-complibs} || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	${EPYTHON} tables/tests/test_all.py || die
+}
+
+python_install_all() {
+	if use doc; then
+		HTML_DOCS=( doc/html/. )
+		DOCS+=( doc/scripts )
+	fi
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+		doins -r contrib
+	fi
+}
diff --git a/dev-python/pytables/pytables-3.2.0.ebuild b/dev-python/pytables/pytables-3.2.0.ebuild
new file mode 100644
index 000000000000..7363094a07fe
--- /dev/null
+++ b/dev-python/pytables/pytables-3.2.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytables/pytables-3.2.0.ebuild,v 1.1 2015/05/15 09:58:58 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+MY_PN=tables
+MY_P=${MY_PN}-${PV}
+
+inherit distutils-r1
+
+DESCRIPTION="Hierarchical datasets for Python"
+HOMEPAGE="http://www.pytables.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD"
+IUSE="doc examples"
+
+RDEPEND="
+	app-arch/bzip2:0=
+	dev-libs/c-blosc:0=[hdf5]
+	dev-libs/lzo:2=
+	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.4[${PYTHON_USEDEP}]
+	>=sci-libs/hdf5-1.8.4:0="
+DEPEND="${RDEPEND}
+	>=dev-python/cython-0.14[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( ANNOUNCE.txt RELEASE_NOTES.txt THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-blosc.patch
+	)
+
+python_prepare_all() {
+	export HDF5_DIR="${EPREFIX}"/usr
+	sed \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		-e 's:"c-blosc/hdf5/blosc_filter.c"::g' \
+		-i setup.py || die
+	rm -r c-blosc/{blosc,hdf5,internal-complibs} || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	${EPYTHON} tables/tests/test_all.py || die
+}
+
+python_install_all() {
+	if use doc; then
+		HTML_DOCS=( doc/html/. )
+		DOCS+=( doc/scripts )
+	fi
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+		doins -r contrib
+	fi
+}