Merge branch 'Reinis-netcdf'

* Reinis-netcdf:
  sci-libs/netcdf-fortran: Version bump to 4.4.2
  sci-libs/netcdf: Version bump to 4.4.0

4 files changed, 100 insertions, 0 deletions

diff --git a/sci-libs/netcdf-fortran/Manifest b/sci-libs/netcdf-fortran/Manifest
index bec5ebb29ad2..c9285d5daea5 100644
--- a/sci-libs/netcdf-fortran/Manifest
+++ b/sci-libs/netcdf-fortran/Manifest
@@ -1 +1,2 @@
 DIST netcdf-fortran-4.2.tar.gz 2479928 SHA256 069e1a0fb50972f28309210987a51563369a6ddb4ac768ef76e599354d384ae9 SHA512 af5d489df7b3ff5c3208115af4abdbf12d74d6bc0b9e3c729cfd24b55efafc3766de21c0f9957e037c25726637e9129a1f7009676e81d7e59650fec56d6e776e WHIRLPOOL 7fd0b2e0025b298a221521987132d389e6fc1bb285318d732b238ebcceedd721741f715848d63266c4a20189f4b0d211585af33e2efed2cac89dd893b07a2418
+DIST netcdf-fortran-4.4.2.tar.gz 1246344 SHA256 f2264174074af0cf332b8dd09e4e184517a2d54f0ca5500e17691152c1ed73aa SHA512 c3f025c0f5a08a0141fa09f570c647fc63992f9fd707969b37c7b0590c3578172200e45ecee497ed054129366fd1c73e3cd069aba879015b13a143e77a181c0f WHIRLPOOL 119345cf7563c15e9d088fc734c3dcbe27c2f76a52ea4479fb771d652815e1cda38914368478f055d2b5d705e7b1779e0954b2f26bb54dab4a995b8c6ebace8a
diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.4.2.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.4.2.ebuild
new file mode 100644
index 000000000000..8b4f231a38b4
--- /dev/null
+++ b/sci-libs/netcdf-fortran/netcdf-fortran-4.4.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+FORTRAN_STANDARD="77 90"
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils fortran-2
+
+DESCRIPTION="Scientific library and interface for array oriented data access"
+HOMEPAGE="http://www.unidata.ucar.edu/software/netcdf/"
+SRC_URI="https://github.com/Unidata/netcdf-fortran/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UCAR-Unidata"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples static-libs"
+
+RDEPEND="sci-libs/netcdf"
+DEPEND="${RDEPEND}
+	dev-lang/cfortran
+"
+
+src_prepare() {
+	# use system cfortran
+	rm libsrc/cfortran.h || die
+
+	autotools-utils_src_prepare
+}
+
+src_install() {
+	autotools-utils_src_install
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index c800b5b3bdd5..bed947ef9ec5 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1 +1,2 @@
 DIST netcdf-4.3.2.tar.gz 5013938 SHA256 57086b4383ce9232f05aad70761c2a6034b1a0c040260577d369b3bbfe6d248e SHA512 9cb9c761bf1e17a37601c37000fdc0bb654afcf111e5ac2fb7dcf037c6aa827e66beb29d5c661edc50ea3f84849f3dee387aab9e85ef81a9b6ca3f36e45debdd WHIRLPOOL 7fb0dd3324c3e8864729db1409a76feb84ef35298c0f79a4258f1cd30a70e90070d9a44275d064d8a4952c32671182f1bfe97d47f26cf921a625bbe7160f3249
+DIST netcdf-4.4.0.tar.gz 17487357 SHA256 09b78b152d3fd373bee4b5738dc05c7b2f5315fe34aa2d94ee9256661119112f SHA512 c5cae15e86d11e6434a489bdac39ea498bdca2008ae6732a16603b32d79a9227a168a0fa0174c6d55ced0c92d9b644f60db4d946f695731161572abd6b778fa1 WHIRLPOOL cdbf02533cd3ebaad563d28a853ec43f0297e4a4be2ced0aea2f44aa07768846a1dba98199c961d5674996f96f931a7b39df584836fd3451530e37a73277de2f
diff --git a/sci-libs/netcdf/netcdf-4.4.0.ebuild b/sci-libs/netcdf/netcdf-4.4.0.ebuild
new file mode 100644
index 000000000000..253c2c98e825
--- /dev/null
+++ b/sci-libs/netcdf/netcdf-4.4.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="Scientific library and interface for array oriented data access"
+HOMEPAGE="http://www.unidata.ucar.edu/software/netcdf/"
+SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UCAR-Unidata"
+SLOT="0/11"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+dap examples hdf +hdf5 mpi static-libs szip test tools"
+
+RDEPEND="
+	dap? ( net-misc/curl:0= )
+	hdf? ( sci-libs/hdf:0= sci-libs/hdf5:0= )
+	hdf5? ( sci-libs/hdf5:0=[mpi=,szip=,zlib] )"
+DEPEND="${RDEPEND}"
+# doc generation is missing many doxygen files in tar ball
+#	doc? ( app-doc/doxygen[dot] )"
+
+REQUIRED_USE="test? ( tools ) szip? ( hdf5 ) mpi? ( hdf5 )"
+
+S="${WORKDIR}/${PN}-c-${PV}"
+
+src_configure() {
+	#	--docdir="${EPREFIX}"/usr/share/doc/${PF}
+	#	$(use_enable doc doxygen)
+	local myeconfargs=(
+		--disable-examples
+		--disable-dap-remote-tests
+		$(use_enable dap)
+		$(use_enable hdf hdf4)
+		$(use_enable hdf5 netcdf-4)
+		$(use_enable tools utilities)
+	)
+	if use mpi; then
+		export CC=mpicc
+		myeconfargs+=( --enable-parallel )
+		use test && myeconfargs+=( --enable-parallel-tests )
+	fi
+	autotools-utils_src_configure
+}
+
+src_test() {
+	autotools-utils_src_test -j1
+}
+
+src_install() {
+	autotools-utils_src_install
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}