Default to gfortran if cannot figure out compiler wrt #348922 by Honza Macháček <Hloupy.Honza@centrum.cz> Drop old.

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

4 files changed, 127 insertions, 2 deletions

diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index 2c3c735b50a0..81791748f204 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/netcdf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.78 2010/12/06 12:47:00 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.79 2010/12/17 20:17:06 xarthisius Exp $
+
+*netcdf-4.1.1-r4 (17 Dec 2010)
+
+  17 Dec 2010; Kacper Kowalik <xarthisius@gentoo.org> +netcdf-4.1.1-r4.ebuild,
+  +files/netcdf-4.1.1-fortran.patch:
+  Default to gfortran if cannot figure out compiler wrt #348922 by Honza
+  Macháček <Hloupy.Honza@centrum.cz> Drop old.
 
 *netcdf-4.1.1-r3 (06 Dec 2010)
 
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 96493974be72..427566e5c8d4 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
+AUX netcdf-4.1.1-fortran.patch 533 RMD160 5237f450bddab15286f4ec4a9abb95953dce437a SHA1 9f5450708b9d7a165d92c3a3545303f2ab797253 SHA256 0b7ed3bc01dfe23fe8eeace124efb3d49e793361a2626e3aeef5bf62c842e5df
 AUX netcdf-4.1.1-implicits.patch 2588 RMD160 1e27a022bb0fb7910bb9940ff2b9410dc0b8550b SHA1 205249ed81d4a09d9ea5bd9936b72c422badece7 SHA256 ffd6d894ea0dc29c56100d9c94fb22e51cb5fe775a41d02aa6367ccf2e091d95
 AUX netcdf-4.1.1-mpi-fix.patch 672 RMD160 3ce460d05e7b665e5cd2b2af5d01a39621da45e6 SHA1 c5ee6d6d36af47e156e5abf3e85fe93319c3008a SHA256 8b891b1ce49442158acb77b48fdaeff203a803ec644dd16fa4e85c14b6debc7c
 AUX netcdf-4.1.1-parallel-build.patch 1251 RMD160 4510fb75315e3762b6cd288f0cc082fa6c843f85 SHA1 74afa2ca9af5eb082a97e0019dcddc2b4ee40078 SHA256 e69c47d96f5b20320450a0f292966b7eaa72d7aa869e1caf7460a3ea0c72a7d1
@@ -7,6 +11,16 @@ DIST netcdf-3.6.3.tar.gz 11572512 RMD160 6917caa05adc2fb9dbf2d43354f6dd00914486a
 DIST netcdf-4.1.1.tar.gz 11201096 RMD160 89b6e1a2115ef348ac83166aa7a50e045fbd98e2 SHA1 6fece208825b978fc2240732f6f57927d71a0552 SHA256 7933d69d378c57f038375bae4dd78c52442a06e2647fce4b75c13a225e342fb0
 EBUILD netcdf-3.6.3.ebuild 2415 RMD160 f5af681e5bf3b635a5a537385d213b97017edaf8 SHA1 125ad71d02a32dcfd014a2dbc2f88c5dccea0b44 SHA256 7e4f33e1a5682a7176f8f08f0cb81e9fe345d0610f3836e99b765d574f074a4f
 EBUILD netcdf-4.1.1-r3.ebuild 2172 RMD160 5c7fb3fa65a42dfc7a357149addfd9e42a919cde SHA1 b0b1b918bec9bf0f70ba157c58612040de3b2834 SHA256 593b0685ef728fa3bc934693d1ad5672a51744ef3a5a409c7d1f4197334ae662
+EBUILD netcdf-4.1.1-r4.ebuild 2206 RMD160 f5a67a3a00d336302d494fdb48cc46d2ee965a11 SHA1 1c8adea1cac0a0d0bafd4845d36bd66a0b85bbd0 SHA256 c01563eeeae9de29a6fe8e709fb725d8ef4d0153d497f440618a034aee0c9a43
 EBUILD netcdf-4.1.1.ebuild 1963 RMD160 3e39844a9b490185dca99f309bee84463b4310a6 SHA1 87a21817a8c0ba7d353a8b8dd39bf454bcb8caaf SHA256 2dfedef4cd594e8e9ef2147a3108ff81f841887de0c4caf9bab813dc4dcfca62
-MISC ChangeLog 14863 RMD160 34d3e480891d7bb0ff9a4dd385991c556d5cb4fd SHA1 e2f527e62cf2902d63d5c70931cd75142777a2cc SHA256 627bb2d87f524c303f92fb91a2762d8de5d222dd46305cd28fd1f978699dc76b
+MISC ChangeLog 15134 RMD160 73ea1785319febc3a41c69e1063fad1548ea3183 SHA1 c6b9f71bb5bdc304231037e921601f91cb3e05d2 SHA256 707677392fc05267c543c1aa7e15f80fd1cbf992d2748c4d7cce2a13d871c6be
 MISC metadata.xml 689 RMD160 ea3463e14f45ed00c810c1ba8b452eb22ed68bc8 SHA1 78128a34222208d7accfdec9e92c75f0ec67ed6a SHA256 31c1ec42edfa2928152c62863bec9f485cf378552ddc9366578aa883dd309f2f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iJwEAQECAAYFAk0LxUwACgkQIiMqcbOVdxSAkAP+O24pqdiGQ/x7WH/3FHWrwoSp
+GlKWmPyh5lfXGDMBvDZz1pXORDz+bacT9ok7eet0FHmV4BLodlVyDHHfrW6nBxS+
+UXE2OLl8B3q0yh8sZcMMJn6DYuU1epGNe/LToIV0NwwmrIQ6oZR0KICdphlMvgkQ
+Dha9AhUbg7o++ZKyUM4=
+=Al/A
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/netcdf/files/netcdf-4.1.1-fortran.patch b/sci-libs/netcdf/files/netcdf-4.1.1-fortran.patch
new file mode 100644
index 000000000000..825fd3b893a1
--- /dev/null
+++ b/sci-libs/netcdf/files/netcdf-4.1.1-fortran.patch
@@ -0,0 +1,15 @@
+Default to gfortran if cannot figure out F77 compiler
+
+https://bugs.gentoo.org/show_bug.cgi?id=348922
+
+--- netcdf-4.1.1/configure.ac
++++ netcdf-4.1.1/configure.ac
+@@ -973,7 +973,7 @@
+              *)
+                 # If it's a gnu compiler, guess f2c.
+                 if test "x$ac_cv_fc_compiler_gnu" = xyes; then
+-                   AC_DEFINE(f2cFortran, [1], [Turned on by netCDF configure.])
++                   AC_DEFINE(gFortran, [1], [Turned on by netCDF configure.])
+                 fi
+                 ;;
+          esac
diff --git a/sci-libs/netcdf/netcdf-4.1.1-r4.ebuild b/sci-libs/netcdf/netcdf-4.1.1-r4.ebuild
new file mode 100644
index 000000000000..29902065a38f
--- /dev/null
+++ b/sci-libs/netcdf/netcdf-4.1.1-r4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2010 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.1 2010/12/17 20:17:06 xarthisius Exp $
+
+EAPI="3"
+
+inherit autotools 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="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cxx dap doc fortran hdf5 static-libs szip"
+
+RDEPEND="dap? ( net-misc/curl )
+	hdf5? ( >=sci-libs/hdf5-1.8[zlib,szip?,fortran?] )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.2
+	doc? ( virtual/latex-base )
+	fortran? ( dev-lang/cfortran )"
+
+DOCS=(README RELEASE_NOTES)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-parallel-build.patch
+	"${FILESDIR}"/${P}-implicits.patch
+	"${FILESDIR}"/${P}-mpi-fix.patch
+	"${FILESDIR}"/${P}-fortran.patch
+)
+
+pkg_setup() {
+	if use hdf5 && has_version sci-libs/hdf5[mpi]; then
+		export CC=mpicc
+		if use cxx; then
+			export CXX=mpicxx
+		fi
+		if use fortran; then
+			export FC=mpif90
+			export F77=mpif77
+		fi
+	fi
+}
+
+src_prepare() {
+	# use system cfortran
+	rm -f fortran/cfortran.h || die
+	# we don't build udunits and libcf
+	sed -i -e '/udunits libcf/d' configure.ac || die
+	if ! use doc; then
+		sed -i -e "/\$(NC_TEST4)/ s/man4//" Makefile.am || die
+	fi
+	autotools-utils_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use hdf5; then
+		myconf="--with-hdf5=${EPREFIX}/usr --with-zlib=${EPREFIX}/usr"
+		use szip && myconf="${myconf} --with-szlib=${EPREFIX}/usr"
+	fi
+
+	myeconfargs=(
+		--enable-shared
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable dap)
+		$(use_enable static-libs static)
+		$(use_enable fortran f77)
+		$(use_enable fortran f90)
+		$(use_enable cxx)
+		$(use_enable fortran separate-fortran)
+		$(use_enable hdf5 netcdf-4)
+		${myconf}
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	# hack to allow parallel build
+	if use doc; then
+		autotools-utils_src_compile pdf
+		autotools-utils_src_compile -j1 -C man4
+	fi
+	autotools-utils_src_compile
+}