gentoo resync : 17.02.2021

3 files changed, 50 insertions, 37 deletions

diff --git a/dev-python/netcdf4-python/Manifest b/dev-python/netcdf4-python/Manifest
index 7949a40745f3..b0c826a75e4a 100644
--- a/dev-python/netcdf4-python/Manifest
+++ b/dev-python/netcdf4-python/Manifest
@@ -1,6 +1,6 @@
 AUX netcdf4-python-1.5.5-tests.patch 1309 BLAKE2B 04876bde9d60bfd48633366eb35d20dab843537673c04ff26fd979cb2de4b6cb36296c2f77b89b2227e7d103a2171827330b4dd0febcffa7aaba288b89becdff SHA512 c876c492c0d5004b1f4092ea580b11f2faf902ed5ce7bbbf16f591e76c12966c15c6616a272ee1e8026b0eba614eb2bdd4cdca495c60f7d7957228eedfae3fd1
-DIST netCDF4-1.2.2.tar.gz 679107 BLAKE2B c15ed9332bd8e4bb18c312cd4418add169716ef29b6f5c4b935c880259a6a16c8388ed7c790919bfbbee631e9e96ce4b9a9afaeabb305e4dd32028353e62207d SHA512 e09465d125077e71b8aad4332be844099c7fa29d0ea8f1dd0887f7a5e849ab778361026323466b1d4897bc3d8f8be1818cfa5f426773c765ee9c5f3728ff3da3
 DIST netCDF4-1.5.5.tar.gz 793676 BLAKE2B 15783e359ed65062464874de24b3fabf07c5666f54f979cb4abd5429cb1668df9dc5aee6d96fb171f597b670ac87ac15400549659c82754da60dc9b00ab734cd SHA512 da6ead22ca60900468fbefdb5d1e9486555e73cf4d99096227404094e94cd4d0488320fe4eb2b7944e1183c39817d9e593065297f921016811b7dc6eabb918ef
-EBUILD netcdf4-python-1.2.2-r1.ebuild 690 BLAKE2B 7c4ab0ec82906910c8e18028dde35c17ec23a7fd7d0ca903259aa91e3439d22eb0527511631f74abd603db7d08120234dc64f0c7660f0f32bc25ce8350829ff2 SHA512 2c97e91a07336a04563c5038b1c99dec7f11a1ffc4351b8ee1ffbdbeb8c192510dd7edbfe98a34367ba81a445b2df40b2d4f8e3da3d18004c5857914a4b7b941
+DIST netCDF4-1.5.6.tar.gz 763732 BLAKE2B 0bb08ed81206c7d14817dad0f93683b5c44678869c760467071e2a0a76be76c9d78c0f714a043d77dba9b4535a83d59d8197340c105070a4f0204900b1e50410 SHA512 cc5bdb476fa034576f8e1a19e709dba53ad2db68cd10221df2de46a47fc7e5bacfc90fe8c4458ef45b20bf24a1cf52f275b1891af5574e2a139e95cb0d793a8b
 EBUILD netcdf4-python-1.5.5.ebuild 1001 BLAKE2B 49a197eb0969a25645131ce17beaa1fe7d44ec0269e1fc6f2e8dc1a9b7210b5a1dc79448357d458106e6c99c2d2aa484d6057f2680bc99e017dada5c7daf6bde SHA512 4c2e4fa1797d6098e55d40d8510ba26de6837df1166a3b3f363f6aae13e0d2efbbc63590d1a07755d0d8277b2710855c3010f1fad4e2f6dcad985c07c5eb83aa
+EBUILD netcdf4-python-1.5.6.ebuild 1165 BLAKE2B 794f9296c48a0df0339aadfa5eeed5f096ff8fcb53afff5d29764fe3d198e32b6e9a3fba168c5962ddea8cc9481dab0066945385494a721c6fb143ebea751889 SHA512 a52abb9570d1ca7eeea14c4df741c9ca9184c19b85443aa3ebbadeb0aa4c9b4ae2fd5d92f23ed99aef361550b674b5be627dfdb25c6f282fe35e1daeca3eb558
 MISC metadata.xml 680 BLAKE2B b380916f10fadde1beadde6b0f97dabdada2a183db75b345dc6bcc8723a24ce5b1d266048e758d02cc53bc0e92339fe359c86741212f9122a984825ebaf45e2c SHA512 5825d714a75190fef8b60360221425c5feed48220920b854f5f2e1a6489b4fa1952b7a798e42c4750b69c83902879ce263fd5b7d109ed9d43a147e6298a329bb
diff --git a/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild b/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild
deleted file mode 100644
index b74d15d31698..000000000000
--- a/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-MY_PN="netCDF4"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python/numpy interface to the netCDF C library"
-HOMEPAGE="https://unidata.github.io/netcdf4-python/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/hdf5
-	sci-libs/netcdf:=[hdf,hdf5]"
-BDEPEND="${RDEPEND}"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	cd test || die
-	${PYTHON} run_all.py || die
-}
diff --git a/dev-python/netcdf4-python/netcdf4-python-1.5.6.ebuild b/dev-python/netcdf4-python/netcdf4-python-1.5.6.ebuild
new file mode 100644
index 000000000000..9340c275dbf1
--- /dev/null
+++ b/dev-python/netcdf4-python/netcdf4-python-1.5.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1 optfeature
+
+MY_PN="netCDF4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python/numpy interface to the netCDF C library"
+HOMEPAGE="https://unidata.github.io/netcdf4-python/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sci-libs/hdf5
+	sci-libs/netcdf:=[hdf5]"
+RDEPEND="${DEPEND}
+	dev-python/cftime[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		sci-libs/hdf5
+		sci-libs/netcdf[hdf5,tools]
+		dev-python/cftime[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	local -x NO_NET=1
+	cd test || die
+	"${EPYTHON}" run_all.py || die
+}
+
+pkg_postinst() {
+	optfeature "HDF4 support" sci-libs/hdf "sci-libs/netcdf[hdf]"
+	optfeature "MPI parallel IO support" "sci-libs/hdf5[mpi]" "sci-libs/netcdf[mpi]"
+	optfeature "OPeNDAP support" net-misc/curl "sci-libs/netcdf[dap]"
+}