gentoo Easter resync : 12.04.2020

6 files changed, 70 insertions, 209 deletions

diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index 456172ab31f6..2930eba21cea 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,10 +1,5 @@
 AUX h5py-2.10.0-tests.patch 1090 BLAKE2B 2c915f28055d6368a5bd43b281d61879e91ae4506e2038b17c7111bae9ebecbb8eb5ca2a2cb8c32b2f6c8cd7c0629cffd926774c3d995fbd0fb6ad09db8c4310 SHA512 7ee887648d025d994eb6e495bad7ab41f7b8c2e9bb65800d9c34c1e31fc1020455202bac87c7cbf2a037a68c7cac43704f02074ae4396053ae03694fab949314
 DIST h5py-2.10.0.tar.gz 301057 BLAKE2B 2e9da02224493b79b2df75ff9aa5cb16ab668d07bb95066356749be09091c54032efb3db8b53bdf0fbbbac2bcde532f9f051627327dcf3f35fb578b701ecc165 SHA512 c49b04f7dcddf03f36d4f063d79ecbe544e0b1daee432d4a76cfa83dac3a1f2cb144f40a74fb85ea17cb5b778f57f709969ea5d1a2afc5bdd5aecbc9d732898d
-DIST h5py-2.7.0.tar.gz 256471 BLAKE2B c232eb86d00b9d1bb76903ea04bfd384bae7c9eb7b301de6aa450a46918f69132ab8d8d5a3f9b54095feee436a8aa9e9045c27ca1a120d665d6031c14218f0f5 SHA512 7c1e5d8b47c176521f5f62cfc4f782c09a0e003c5cbc07a673ccc3dfbe97df930b33801ef7311360892e3fad1d7d72561a8578aed9cb630d44e1a73543bb5da4
-DIST h5py-2.7.1.tar.gz 264225 BLAKE2B ffb0b52127f6cb9634b5ac3266a36bc0003144d302bdc300fff5f6f33e52b5a12e954cc2ef9fdfe9dfa0eddc810b30ee3f556cab2a31338500db666b87e64ddc SHA512 b702e3875c2767d2fabe66601820c517671fb5fc3321334aba081950b625435a1262554f39187cd1b41c6069e2b3826db6f0b610bfed2abe5db8a4dd8a29ecfd
-DIST h5py-2.9.0.tar.gz 287853 BLAKE2B f1e5c985ec1431dca2b14490711ec7f125620e67ee6cecb56306d19cc8fd1d1c33d313f6477e98c4dbb780cc50c3a4ca073cfe69e079187f8f52a301aab60467 SHA512 73b1f59e3e2b3eceebf7b97e49bd8f5199afafd7ef29917af05ff8415c2f2129a5c59db9658944370c9bcf8fc04ab26948ee27fc6fd948a22d19cace1ce8c853
-EBUILD h5py-2.10.0.ebuild 1446 BLAKE2B 39803d4a8c4a8d1b587ef1eb8316b6ee291d528005b31dbfe9bfe60db0398c58c1c2b5a52979b89acf826a7eaee657fc9a15a8faf2748308cc9a3bf8c55d17cd SHA512 d0702b750ff467c8c163d51866424e0098b6871632e2a804eaed2421ad785bb5ae019854b0d2fbf10f707ecb19b57f8829eeaf6d31f183d496b84d49c0b9737a
-EBUILD h5py-2.7.0.ebuild 1391 BLAKE2B 40f2033d285ecca7028d143f77d3983acc5803cef31f7a3044cc16d0795271e10eabbee9bcd0296bf2dff9b93ada52b09d7ad20db4405adbcd4c4b7a5adba6a8 SHA512 62655c2437034edb45604f71080452367e4cc7f630e61e7b267d348f177738098f1fccc1190857e9af118fc6f5bc1ba233bb4b0c845e85f0ec486a603d079516
-EBUILD h5py-2.7.1.ebuild 1393 BLAKE2B d8e68d8d932b31426944a8e602c3bfb1f01c6e500be596b58bd7a057ffb21d96feede48abc63910a1de2c546a21968f7dc84038d0699cd83aac29f73e6fa9396 SHA512 62583885e80f806f7ce2bd20dc69198d0238948080066890e82b38658f94e6cb9e95a76f978cfbd80244bf098114b0611ecbd72408805c8027abba754bbd188c
-EBUILD h5py-2.9.0.ebuild 1397 BLAKE2B 26bb7887bfdeb2232e223105154619562858ccc846d2839d65678f6fea3a4503c5e87e71a2e668cff5e8292b71a170110e2ec548e3363aa6b6ede3c2933ce7da SHA512 457989f5a5592f05771087a5c35a4f55efe5ad95730a179212decc5c52aa1ded4fda509e6e56c73805349d2f03f1119a30dd39e5e654c907f772d6d652375708
+EBUILD h5py-2.10.0-r1.ebuild 1567 BLAKE2B e3fbdea3ab8e52f5108add750801c1d39f847fcee7f81e78ae9f694ac836fc37b4cb8c8b9df0e9394e34ecfe75e338cb72db8013dc25aef94c523338e22bc765 SHA512 f3e0adda9ee3a87475f8f55fdcb0b279be0d19dd0acb9485453dc16d356f2840dc4f736dfd3b340893fc92b611ea887724b8852b18b9d255f3bfbbede54fe722
+EBUILD h5py-2.10.0.ebuild 1444 BLAKE2B 33f6fe1ec2965ba813db74d215049135b8bed3f02aedf9d3958ed4a1b3e53a738ee4f68c0ba7bc23e982c595d1e4d18b88623e0884c96d70af3f0edb2fb8e4b5 SHA512 0f74c2ce5ea0736339039c751026530cd61d96eb4c45c0d69aa2fd583a0dc9db08068041ed3dfd656811dd5d614396b3f7b73ec4610529016c4a1b29a1da149d
 MISC metadata.xml 1015 BLAKE2B 4b62b6e3d38b745ff2e27bfdd14e6ca380264089c9953e09e6f8c12e223fc9ad45072b8c884ee9a7c24329a00e71a93207d3ffb21b17e8377bf195fb20b54ad1 SHA512 1880b779b8917357e6301273a304314e73686cea70325c2ee17c1bd901190bf0b07575584275039d199df6b190df9be3ab6617ee9f2babb0b609c408cba5af52
diff --git a/dev-python/h5py/h5py-2.10.0-r1.ebuild b/dev-python/h5py/h5py-2.10.0-r1.ebuild
new file mode 100644
index 000000000000..8ae6c9b9c69c
--- /dev/null
+++ b/dev-python/h5py/h5py-2.10.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Simple Python interface to HDF5 files"
+HOMEPAGE="https://www.h5py.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+# disable mpi until mpi4py gets python3_8
+#IUSE="examples mpi"
+IUSE="examples"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+#RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
+RDEPEND="sci-libs/hdf5:=[hl(+)]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+BDEPEND="dev-python/pkgconfig"
+#	mpi? ( virtual/mpi )
+
+DEPEND="dev-python/cython[${PYTHON_USEDEP}]
+	doc? ( dev-python/alabaster[${PYTHON_USEDEP}] )
+	test? ( dev-python/QtPy[testlib,${PYTHON_USEDEP}]
+		dev-python/cached-property[${PYTHON_USEDEP}] )"
+#	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
+
+PATCHES="${FILESDIR}/${P}-tests.patch"
+
+DOCS=( README.rst AUTHORS ANN.rst )
+
+distutils_enable_tests setup.py
+distutils_enable_sphinx docs --no-autodoc
+
+#pkg_setup() {
+#	use mpi && export CC=mpicc
+#}
+
+python_prepare_all() {
+	append-cflags -fno-strict-aliasing
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+#	esetup.py configure $(usex mpi --mpi '')
+	esetup.py configure
+}
+
+python_test() {
+	esetup.py test || die "Tests fail with ${EPYTHON}"
+	# tests generate .pytest_cache which should not be installed
+	rm -r "${BUILD_DIR}/lib/.pytest_cache" || die
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/h5py/h5py-2.10.0.ebuild b/dev-python/h5py/h5py-2.10.0.ebuild
index b9c906c32921..d524e809356c 100644
--- a/dev-python/h5py/h5py-2.10.0.ebuild
+++ b/dev-python/h5py/h5py-2.10.0.ebuild
@@ -15,7 +15,7 @@ IUSE="examples mpi"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/h5py/h5py-2.7.0.ebuild b/dev-python/h5py/h5py-2.7.0.ebuild
deleted file mode 100644
index 93ecc9cf6908..000000000000
--- a/dev-python/h5py/h5py-2.7.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="http://www.h5py.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test examples mpi"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/hdf5:=[mpi=,hl(+)]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/alabaster[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		)
-	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )"
-
-pkg_setup() {
-	use mpi && export CC=mpicc
-}
-
-python_prepare_all() {
-	append-cflags -fno-strict-aliasing
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	esetup.py configure $(usex mpi --mpi '')
-}
-
-python_compile_all() {
-	if use doc; then
-		cd "${S}"/docs || die
-		sed '/html_theme/s:default:alabaster:g' -i conf.py || die
-		emake html
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	DOCS=( README.rst ANN.rst )
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && DOCS+=( examples )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/h5py/h5py-2.7.1.ebuild b/dev-python/h5py/h5py-2.7.1.ebuild
deleted file mode 100644
index 1cad22dbb1a2..000000000000
--- a/dev-python/h5py/h5py-2.7.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="http://www.h5py.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test examples mpi"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/hdf5:=[mpi=,hl(+)]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/alabaster[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		)
-	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )"
-
-pkg_setup() {
-	use mpi && export CC=mpicc
-}
-
-python_prepare_all() {
-	append-cflags -fno-strict-aliasing
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	esetup.py configure $(usex mpi --mpi '')
-}
-
-python_compile_all() {
-	if use doc; then
-		cd "${S}"/docs || die
-		sed '/html_theme/s:default:alabaster:g' -i conf.py || die
-		emake html
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	DOCS=( README.rst ANN.rst )
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && DOCS+=( examples )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/h5py/h5py-2.9.0.ebuild b/dev-python/h5py/h5py-2.9.0.ebuild
deleted file mode 100644
index f8a8600ad6ed..000000000000
--- a/dev-python/h5py/h5py-2.9.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="http://www.h5py.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test examples mpi"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/hdf5:=[mpi=,hl(+)]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/alabaster[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		)
-	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )"
-
-pkg_setup() {
-	use mpi && export CC=mpicc
-}
-
-python_prepare_all() {
-	append-cflags -fno-strict-aliasing
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	esetup.py configure $(usex mpi --mpi '')
-}
-
-python_compile_all() {
-	if use doc; then
-		cd "${S}"/docs || die
-		sed '/html_theme/s:default:alabaster:g' -i conf.py || die
-		emake html
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	DOCS=( README.rst ANN.rst )
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && DOCS+=( examples )
-
-	distutils-r1_python_install_all
-}