sci-libs/netcdf: Only call fortran-2_pkg_setup with USE=fortran, #423797

Package-Manager: portage-2.2.0_alpha112/cvs/Linux x86_64

5 files changed, 30 insertions, 21 deletions

diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index 3917d424598b..f9d303ec0bc3 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,10 @@
 # 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.97 2012/04/23 16:11:43 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.98 2012/06/27 10:05:28 jlec Exp $
+
+  27 Jun 2012; Justin Lecher <jlec@gentoo.org> netcdf-3.6.3.ebuild,
+  netcdf-4.1.1-r4.ebuild, metadata.xml:
+  Only call fortran-2_pkg_setup with USE=fortran, #423797
 
   23 Apr 2012; Sébastien Fabbro <bicatali@gentoo.org> netcdf-4.2.ebuild:
   Changed configure option for better behaviour on hdf5, bug #413031, thanks
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index cf217f92495e..bbada68eb6c0 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX netcdf-3.6.3-as-needed.patch 1794 RMD160 4b81004e09b1d620ad6fe3450ed3906f214cfa32 SHA1 f3c3809227674cdcdd0ec0ea3236c68cda8e9bf7 SHA256 4bd124aac6f9b3aeedf91b89e713cb1dd035423361ef609e784b17b4b08be645
 AUX netcdf-3.6.3-parallel.patch 518 RMD160 840c57498d0dd75f33f1653be0a811248b2c1d18 SHA1 f8a14e3d069c9983bbb9fd3b3ebdd9f480617e2a SHA256 ff26354df395398b70ebb28c26a0478e6a0bff18fdf6b46cece9a619d3df1b97
@@ -11,16 +11,17 @@ DIST netcdf-3.6.3.tar.gz 11572512 RMD160 6917caa05adc2fb9dbf2d43354f6dd00914486a
 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-3.6.3.ebuild 2501 RMD160 2a1c8aa269080ee03438fe26bb1e81fee0cd53c1 SHA1 4bfbd50c6bb95d8b13f595e04a602fd2454992e7 SHA256 5778337c633775e3278a174dd7daaf7dda8d364d5a360831781c2d6c77de2a0e
+EBUILD netcdf-4.1.1-r4.ebuild 2322 RMD160 1aac73c861eb158b5b30e2da626399216e8e4e8e SHA1 b3e06527969431641e0e4398b82fd5c1b4b2a6d8 SHA256 eb5e23da1c8651298d963e3fd1078cc79d805ec36d42a2d5694b3f27d2101a63
 EBUILD netcdf-4.1.3.ebuild 2121 RMD160 975497fa91c32ea1b7f42a4d5f1b342217bff479 SHA1 9dbb7e95498d6005683d7008b28a5650fac72c71 SHA256 36b3eac5531dcc804d18335edfb60ca7e26300670b95c137049f63fc75258afd
 EBUILD netcdf-4.2.ebuild 1131 RMD160 f1cf03b667a77bcc6e675229f867b3a73dac17b9 SHA1 406401e900708593f7b5eb649fde8bcb40a28716 SHA256 a194d996cf5bd75b4df83750a7effb419eee15ca62ce26dc02c684e32bceb3be
-MISC ChangeLog 17768 RMD160 0a62134c8c191fec5283d240d83696b5020ca125 SHA1 e90feadef648d7c51bf5d6c6b7ec24c1fc339b2b SHA256 f31a9d8fe546ddeb832006a87546f9e5f7568afebecd8b252ef6456d5d10c631
-MISC metadata.xml 862 RMD160 3913b0885a93756816405e7e618b8c55c61cbb83 SHA1 f161fd70a8bd7a0c28c62c9ea6846e0e9be5a79d SHA256 d7245fe8a4a46b6686bd85d90a4d91b94cc27936deee5a469d1e5f4f4fc6d8df
+MISC ChangeLog 17931 RMD160 5ddb59b7455d47c7000f7ee2db1f7a801e596933 SHA1 b9e67faac04a1651083b0bf16f57932a180a9f25 SHA256 b68c8d0cd1adf06b74020aba28d71211d1b22d8fd1cd9c465abd03a49822ff5e
+MISC metadata.xml 865 RMD160 8b5f394fbf77b555767b93b6a684039d4a3a0bcb SHA1 be03afe0777ad9ec345c6371552ee4eb8ff90446 SHA256 a7e5fcd9fe0ddd889a8cc960f20fee5d43cd55e19baced8feef80edeaacd4137
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEARECAAYFAk+Vf0kACgkQ1ycZbhPLE2DmOgCglW6w51LyDnxLigoPtCCj//aB
-AkUAmwRWSgzbhF8OyFdG3of2JSCONIxB
-=zM3B
+iEYEAREKAAYFAk/q2u4ACgkQgAnW8HDreRZY9gCffa5Ei5z/OfxwqZ6wkTbJlfTR
+43YAnAr8uC7c6NFz2AgG/o3evIApt1kI
+=MeAd
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/netcdf/metadata.xml b/sci-libs/netcdf/metadata.xml
index d11d9efa513a..cf4ac7d22469 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,9 +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>
-  <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>
+	<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-3.6.3.ebuild b/sci-libs/netcdf/netcdf-3.6.3.ebuild
index 1535e5b51461..83712231512b 100644
--- a/sci-libs/netcdf/netcdf-3.6.3.ebuild
+++ b/sci-libs/netcdf/netcdf-3.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-3.6.3.ebuild,v 1.18 2011/06/21 15:08:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.3.ebuild,v 1.19 2012/06/27 10:05:28 jlec Exp $
 
 EAPI=2
 
@@ -22,6 +22,10 @@ DEPEND="${RDEPEND}
 	>=sys-devel/libtool-2.2
 	doc? ( virtual/latex-base )"
 
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-as-needed.patch
 	epatch "${FILESDIR}"/${P}-parallel.patch
diff --git a/sci-libs/netcdf/netcdf-4.1.1-r4.ebuild b/sci-libs/netcdf/netcdf-4.1.1-r4.ebuild
index 0bcfefb1bf5d..608b614ead44 100644
--- a/sci-libs/netcdf/netcdf-4.1.1-r4.ebuild
+++ b/sci-libs/netcdf/netcdf-4.1.1-r4.ebuild
@@ -1,6 +1,6 @@
 # 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.1.1-r4.ebuild,v 1.13 2012/03/25 10:35:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.1.1-r4.ebuild,v 1.14 2012/06/27 10:05:28 jlec Exp $
 
 EAPI=3
 
@@ -37,7 +37,7 @@ PATCHES=(
 )
 
 pkg_setup() {
-	fortran-2_pkg_setup
+	use fortran && fortran-2_pkg_setup
 	if use hdf5 && has_version sci-libs/hdf5[mpi]; then
 		export CC=mpicc
 		if use cxx; then