gentoo resync : 05.12.2021

3 files changed, 49 insertions, 6 deletions

diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest
index 541e20948a46..7ff01fc4ae0d 100644
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@@ -1,5 +1,6 @@
+AUX pytables-3.6.1-big-endian-tests-skip-subset.patch 1328 BLAKE2B 05aface3d7a13bb3e119980faa7fbb9b3ef24c4c2cf4a5dec202c28745f66ceb9f9a8865f43a6f6718f05037c8c5bf180ce78da6aa670581e0c0fde1dc00c2ca SHA512 83749970a8370af952a757cf641d71b7c1c1cc5106f0fe27c09b976671dd568127541ebb9deb793f8c2fd9fc32a885079cb5c281acccba81c1c7a1204ea9c786
 AUX pytables-3.6.1-numpy-float.patch 7336 BLAKE2B 7322dea9dcc5d115dd7fe8a92e5547359c2496326f7195d6b14f596ea8eaf69b8b3e583a7de68bb22c9346073de31e46e9bf36babc423eecd1e36772d6a6e094 SHA512 2807aa3ddcb9a9e0cd086e621d9a906c6de9c49ac1668f261ac284b7b28841c36645e42557fbe3b45b21dab9c8551fc022d5496658d8ed267516d54021791ef5
 AUX pytables-3.6.1-py310.patch 1960 BLAKE2B fd0dede7bf5b515e03d7f936b2e512b815053aed8a4e5fad6f68844a3cb99b3d51a44d8c665d6113c79bb44cafd4f85d12142d1a94e70bef454970498b1909b3 SHA512 06d28a86fad569373304167440d364341a32121c6f7fb6d777d7c320c97c6e3903f862f5372dc85b5c6f953b168aa26029d0559004003526730e9b5af3284dda
 DIST tables-3.6.1.tar.gz 4641089 BLAKE2B 4ef44b1263f40babe6719bac911ab191e9cb0c58c377705b755fa83f1fba5af1d0fab10b0b45bd6af619a9dce4842a80afad8d8fbab64c3be4f35a1b3f117ee3 SHA512 7f018b70251095049bce9075be4e19f72efba9d39121a35c4521f634b1dd5b81ab6de47df3bb44ad6b8b2dbdbff4e6d0985ad1a7b2f13b44f920c0935e5830ff
-EBUILD pytables-3.6.1.ebuild 1794 BLAKE2B d8bc10027e418f775e12d76542cefd3b58b2b3f25fbf157fa114e5fcb79164a3045578e40bf60c96d2ba574bf0ac2dbd8ac638e1689d8698341ede17ce94fa88 SHA512 4804d2626144247da5cf0671e4315ddad547e8c4187b50ac00325dd0232c187ca4d5db1413aa3e49939062a4d3d21b1b9552aceaf06d5de8d28964f39e70d813
+EBUILD pytables-3.6.1-r2.ebuild 2026 BLAKE2B 1ef0fc7d147fb844090886379f0597a5c6342f41dc9c7f41057bebc3876e4d39df7999076d2bc519bd5ec1ec3f22ce5c6fc78370cfaeff4d959d7cc4fa35e150 SHA512 e3c8506d65b9602e56847406a5062ec0fd4ce62c1900732b700e822c1ab1a3bb6d0f4d543ef8bfe56dccbde84ad4ec5056d44c959e7b5d54f010a3952c9a47dd
 MISC metadata.xml 895 BLAKE2B a6d5fd675fc62419446dcfb557f0f16d1f0a9b7552b5a9d05286486603fb038ae49d0df6ecc6214e8b18f64c168fd0fb0c12dd1d052cb66a4c54921bb529bd2f SHA512 412a0d2d5f90b7b73889f531b2759c2466a7effb507e38095810453237b6989e95a02f2fca102a43b9c088fa563fef3d761831b28633510e9318d6e50ec6a5b6
diff --git a/dev-python/pytables/files/pytables-3.6.1-big-endian-tests-skip-subset.patch b/dev-python/pytables/files/pytables-3.6.1-big-endian-tests-skip-subset.patch
new file mode 100644
index 000000000000..6a492a1a581f
--- /dev/null
+++ b/dev-python/pytables/files/pytables-3.6.1-big-endian-tests-skip-subset.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/805995
+https://github.com/PyTables/PyTables/issues/735
+https://sources.debian.org/src/pytables/3.6.1-5/debian/patches/0005-Skip-index-backcompat-tests-on-bingendian.patch/
+
+From: Antonio Valentino <antonio.valentino@tiscali.it>
+Date: Sat, 3 Aug 2019 16:22:13 +0000
+Subject: Skip index backcompat tests on bingendian
+
+Forwarded: not-needed
+--- a/tables/tests/test_index_backcompat.py
++++ b/tables/tests/test_index_backcompat.py
+@@ -6,8 +6,10 @@ from tables.tests.common import verbose
+ from tables.tests.common import unittest, test_filename
+ from tables.tests.common import PyTablesTestCase as TestCase
+ 
++import sys
+ 
+ # Check indexes from PyTables version 2.0
++@unittest.skipIf(sys.byteorder != 'little', 'broken on big-endian')
+ class IndexesTestCase(common.TestFileMixin, TestCase):
+ 
+     def setUp(self):
+@@ -145,11 +147,13 @@ class IndexesTestCase(common.TestFileMixin, TestCase):
+ 
+ 
+ # Check indexes from PyTables version 2.0
++@unittest.skipIf(sys.byteorder != 'little', 'broken on big-endian')
+ class Indexes2_0TestCase(IndexesTestCase):
+     h5fname = test_filename("indexes_2_0.h5")
+ 
+ 
+ # Check indexes from PyTables version 2.1
++@unittest.skipIf(sys.byteorder != 'little', 'broken on big-endian')
+ class Indexes2_1TestCase(IndexesTestCase):
+     h5fname = test_filename("indexes_2_1.h5")
+ 
diff --git a/dev-python/pytables/pytables-3.6.1.ebuild b/dev-python/pytables/pytables-3.6.1-r2.ebuild
index 8197249c5c3a..39b290e8a448 100644
--- a/dev-python/pytables/pytables-3.6.1.ebuild
+++ b/dev-python/pytables/pytables-3.6.1-r2.ebuild
@@ -9,19 +9,20 @@ PYTHON_REQ_USE="threads(+)"
 MY_PN=tables
 MY_P=${MY_PN}-${PV}
 
-inherit distutils-r1 flag-o-matic
+inherit distutils-r1
 
 DESCRIPTION="Hierarchical datasets for Python"
 HOMEPAGE="https://www.pytables.org/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
+# See https://github.com/PyTables/PyTables/issues/912 for hdf5 upper bound
 DEPEND="
 	app-arch/bzip2:0=
 	app-arch/lz4:0=
@@ -29,13 +30,14 @@ DEPEND="
 	>=dev-libs/c-blosc-1.11.1:0=
 	dev-libs/lzo:2=
 	>=dev-python/numpy-1.8.1[${PYTHON_USEDEP}]
-	>=sci-libs/hdf5-1.8.15:0=
+	<sci-libs/hdf5-1.12:=
 "
 RDEPEND="${DEPEND}
 	>=dev-python/numexpr-2.5.2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
 	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
+	virtual/pkgconfig
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		${RDEPEND}
@@ -47,10 +49,14 @@ DOCS=( RELEASE_NOTES.txt THANKS )
 PATCHES=(
 	"${FILESDIR}"/${P}-numpy-float.patch
 	"${FILESDIR}"/${P}-py310.patch
+	"${FILESDIR}"/${PN}-3.6.1-big-endian-tests-skip-subset.patch
 )
 
 python_prepare_all() {
-	export HDF5_DIR="${EPREFIX}"/usr
+	export {BLOSC,BZIP2,LZO,HDF5}_DIR="${ESYSROOT}"/usr
+	export PYTABLES_NO_EMBEDDED_LIBS=1
+	export USE_PKGCONFIG=TRUE
+
 	rm tables/*.c || die
 	sed -e "s:/usr:${EPREFIX}/usr:g" \
 		-i setup.py || die