Version bump. C++ and FORTRAN libraries are now in packages netcdf-cxx and netcdf-fortran, following upstream. All patches applied upstream

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 66 insertions, 11 deletions

diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index 582b3d1da28b..126b5febd152 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/netcdf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.95 2012/03/29 19:01:45 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.96 2012/04/18 19:10:26 bicatali Exp $
+
+*netcdf-4.2 (18 Apr 2012)
+
+  18 Apr 2012; Sébastien Fabbro <bicatali@gentoo.org> +netcdf-4.2.ebuild,
+  metadata.xml:
+  Version bump. C++ and FORTRAN libraries are now in packages netcdf-cxx and
+  netcdf-fortran, following upstream. All patches applied upstream
 
   29 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> netcdf-4.1.3.ebuild:
   Fixed minimum libtool dependency (bug #409219, thanks dima), fixes a sed for
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index a42fadd81762..62e9807b9eb5 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -10,15 +10,17 @@ AUX netcdf-4.1.1-parallel-build.patch 1311 RMD160 ea8237befdf90fb373a561531decee
 DIST netcdf-3.6.3.tar.gz 11572512 RMD160 6917caa05adc2fb9dbf2d43354f6dd00914486a2 SHA1 711e5f2a24e1679b17715398ba58127e50cd7fb3 SHA256 afa1a0fa82b9ea33b035257b6e9662b22e135f98b2fd93d5cf030320dfc3ffa1
 DIST netcdf-4.1.1.tar.gz 11201096 RMD160 89b6e1a2115ef348ac83166aa7a50e045fbd98e2 SHA1 6fece208825b978fc2240732f6f57927d71a0552 SHA256 7933d69d378c57f038375bae4dd78c52442a06e2647fce4b75c13a225e342fb0
 DIST netcdf-4.1.3.tar.gz 11097157 RMD160 ac07f570873bba89a49cb2eb2275a40cbc8e502b SHA1 e600322478276f51612e17cca3cda38489003f81 SHA256 315bc385b0750dd85b9a122194382db52f432dea1390de9f7afa11cf91869213
+DIST netcdf-4.2.tar.gz 4528968 RMD160 2cc9064e96df98e82a328c8984bbb4aaf8e4d698 SHA1 949df89cd05ab8386e5f8080a183dc63c2f2f3bd SHA256 541bcc14f4b524e1cacc9e70fe814768e66b2dac2fd5c082ff39beb91c44a1e4
 EBUILD netcdf-3.6.3.ebuild 2448 RMD160 0281d6e6e190812e45b9aaff82154be61500d26d SHA1 0c39bf834706e584efef325e796326ff8cb0421c SHA256 567bffa7a41fe0f63ecca2d9243fc4d03d75d67f07934a3cdea4182f41049954
 EBUILD netcdf-4.1.1-r4.ebuild 2307 RMD160 dd4818609384a28e7f3f55271e3dc4506fae442c SHA1 ad86af12a4a3de996f2b5eedab0ef7375fdfcfeb SHA256 ee05f06b5380eb9c37c7cb039c973380723a1da5ba71ba6bcedd876fe46a1df3
 EBUILD netcdf-4.1.3.ebuild 2121 RMD160 975497fa91c32ea1b7f42a4d5f1b342217bff479 SHA1 9dbb7e95498d6005683d7008b28a5650fac72c71 SHA256 36b3eac5531dcc804d18335edfb60ca7e26300670b95c137049f63fc75258afd
-MISC ChangeLog 17343 RMD160 77842255423aa16b3fd7a37a8db27d3a79087511 SHA1 557f056ef4ddbeac45a8b91b2ade7d3f5f05005d SHA256 2db80a4f02ed236958c3b89ffd34d8e06d633029dd2bc5a0dab28d0204445893
-MISC metadata.xml 694 RMD160 a9753b2677a6b99c8bb24277c240419c5c2c6a27 SHA1 88ad0c99b930f80ddb799157117fe44a7c2f9361 SHA256 ecfdc3bfa2846cb731e4aa422fdf5730e1008782dbbf51735c3aae6567d169fd
+EBUILD netcdf-4.2.ebuild 1130 RMD160 b16246c53e2e261c9b968be03886096fe273a2a2 SHA1 a921870ca295533fe6f1915eb92dabe25958f73c SHA256 8c109ba78b261c40063f67d14c7da3d78b685331b80e58dfbf4e8fd4b2ff0bfc
+MISC ChangeLog 17606 RMD160 94293a13895f348fc149fb20e7d40dcc3d15de38 SHA1 2fbcaaf3e2765ac6ef718e2eb326c4638d5ac638 SHA256 7d4e7842bc6b89c38945779951a7533b2a548879134e4ae0a96bfbbf558379c4
+MISC metadata.xml 862 RMD160 3913b0885a93756816405e7e618b8c55c61cbb83 SHA1 f161fd70a8bd7a0c28c62c9ea6846e0e9be5a79d SHA256 d7245fe8a4a46b6686bd85d90a4d91b94cc27936deee5a469d1e5f4f4fc6d8df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk90saEACgkQ1ycZbhPLE2D6PACgpfKCm7a5Ok6FZQC8RAJECxG2
-o/8An02cdjjlQ1JjCbsOOU+BGPiCgqLt
-=qKet
+iEYEARECAAYFAk+PEasACgkQ1ycZbhPLE2A5uwCfRK0BhchWSfJtqa82EH+PYFNy
+AqwAn1M0/73x/pHhnJPrHTgv9ROt6LOm
+=t3kj
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/netcdf/metadata.xml b/sci-libs/netcdf/metadata.xml
index 19e0ef6858c6..d11d9efa513a 100644
--- a/sci-libs/netcdf/metadata.xml
+++ b/sci-libs/netcdf/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<longdescription lang="en">
+ <herd>sci</herd>
+<longdescription lang="en">
   NetCDF (network Common Data Form) is an interface for scientific
   data access and a freely-distributed software library that provides an
   implementation of the interface.  The netCDF library also defines a
@@ -10,7 +10,9 @@
   Together, the interface, library, and format support the creation,
   access, and sharing of scientific data.
 </longdescription>
-	<use>
-		<flag name="dap">Support for remote data access with the built-in OPeNDAP client</flag>
-	</use>
+<use>
+  <flag name="dap">Support for remote data access with the built-in OPeNDAP client</flag>
+  <flag name="hdf">dd support for the Hierarchical Data Format v. 4<pkg>sci-libs/hdf</pkg></flag>
+  <flag name="tools">Build the utilities nccopy, ncgen and ncdump</flag>
+</use>
 </pkgmetadata>
diff --git a/sci-libs/netcdf/netcdf-4.2.ebuild b/sci-libs/netcdf/netcdf-4.2.ebuild
new file mode 100644
index 000000000000..cc9dc53d6c61
--- /dev/null
+++ b/sci-libs/netcdf/netcdf-4.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.2.ebuild,v 1.1 2012/04/18 19:10:26 bicatali Exp $
+
+EAPI=4
+
+inherit autotools-utils
+
+DESCRIPTION="Scientific library and interface for array oriented data access"
+HOMEPAGE="http://www.unidata.ucar.edu/software/netcdf/"
+SRC_URI="ftp://ftp.unidata.ucar.edu/pub/netcdf/${P}.tar.gz"
+
+LICENSE="UCAR-Unidata"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+dap doc hdf +hdf5 mpi static-libs szip tools"
+
+RDEPEND="dap? ( net-misc/curl )
+	hdf? ( sci-libs/hdf >=sci-libs/hdf5-1.8.8 )
+	hdf5? ( >=sci-libs/hdf5-1.8.8[mpi=,szip=,zlib] )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	myeconfargs=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--disable-examples
+		$(use_enable dap)
+		$(use_enable doc doxygen)
+		$(use_enable hdf hdf4)
+		$(use_enable hdf5 netcdf4)
+		$(use_enable tools utilities)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}