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

(Portage version: 2.2.0_alpha112/cvs/Linux x86_64)

4 files changed, 20 insertions, 12 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/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