update fortran handling (bug 133519)

(Portage version: 2.1_rc1-r3)

4 files changed, 38 insertions, 12 deletions

diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index 78fa1ad0654d..7fbad544ce1c 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/netcdf
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.18 2006/05/07 19:53:20 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.19 2006/05/25 20:30:08 nerdboy Exp $
+
+  25 May 2006; Steve Arnold <nerdboy@gentoo.org> netcdf-3.6.1.ebuild:
+  update fortran handling (bug 133519)
 
   07 May 2006; Markus Rothe <corsair@gentoo.org> netcdf-3.6.0-r1.ebuild:
   Stable on ppc64; bug #98597
diff --git a/sci-libs/netcdf/files/digest-netcdf-3.5.0-r3 b/sci-libs/netcdf/files/digest-netcdf-3.5.0-r3
index 25d6e8d0de3d..730db80e2338 100644
--- a/sci-libs/netcdf/files/digest-netcdf-3.5.0-r3
+++ b/sci-libs/netcdf/files/digest-netcdf-3.5.0-r3
@@ -1 +1,3 @@
 MD5 28640a40a44f982f90f5eeb15e917a1f netcdf-3.5.0.tar.Z 1319419
+RMD160 4313e00fc56273e871c003bfb27c533d4a7f556f netcdf-3.5.0.tar.Z 1319419
+SHA256 d3a2113a9174d845dc377122826cd68b1e02fbb253c0f0c253b8e1c199c84b97 netcdf-3.5.0.tar.Z 1319419
diff --git a/sci-libs/netcdf/files/digest-netcdf-3.6.0-r1 b/sci-libs/netcdf/files/digest-netcdf-3.6.0-r1
index 5fc78b791d6c..8751c862900c 100644
--- a/sci-libs/netcdf/files/digest-netcdf-3.6.0-r1
+++ b/sci-libs/netcdf/files/digest-netcdf-3.6.0-r1
@@ -1 +1,3 @@
 MD5 27c193e0462d9979406d167a01a5ee95 netcdf-3.6.0-p1.tar.gz 842025
+RMD160 f59877c5f1f70b7099f263f0a34c1b1bd12d41d9 netcdf-3.6.0-p1.tar.gz 842025
+SHA256 a9e6105ed89ce6cfd2edc78e8184232a2f950e674c5241c28cae361a1fe1adfe netcdf-3.6.0-p1.tar.gz 842025
diff --git a/sci-libs/netcdf/netcdf-3.6.1.ebuild b/sci-libs/netcdf/netcdf-3.6.1.ebuild
index b87bd5ea9694..1a8cb7102ea1 100644
--- a/sci-libs/netcdf/netcdf-3.6.1.ebuild
+++ b/sci-libs/netcdf/netcdf-3.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.1.ebuild,v 1.1 2006/04/07 13:57:30 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.1.ebuild,v 1.2 2006/05/25 20:30:08 nerdboy Exp $
 
 inherit fortran eutils
 
@@ -10,11 +10,19 @@ HOMEPAGE="http://my.unidata.ucar.edu/content/software/netcdf/index.html"
 
 LICENSE="UCAR-Unidata"
 SLOT="0"
-IUSE=""
+IUSE="fortran"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 S="${WORKDIR}/${P}/src"
 
+fortran_pkg_setup() {
+	if use fortran ; then
+		FORTRAN="g77 gfortran pgf90"
+		need_fortran "g77 gfortran pgf90"
+	else
+		FORTRAN=""
+	fi
+}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -24,10 +32,12 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	if [[ ${FORTRANC} == gfortran ]]; then
+	if use fortran ; then
+	    if [ ${FORTRANC} == gfortran -o ${FORTRANC} == pgf90 ] ; then
 		myconf="${myconf} CPPFLAGS=-DpgiFortran"
-	else
+	    else
 		myconf="${myconf} CPPFLAGS=-Df2cFortran"
+	    fi
 	fi
 
 	econf ${myconf} || die "econf failed"
@@ -36,12 +46,21 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/{lib,share} /usr/share/man/man3 /usr/share/man/man3f
-	einstall MANDIR=${D}/usr/share/man \
-		|| die "Failed to install man pages"
-	mv ${D}/usr/share/man/man3/netcdf.3f ${D}/usr/share/man/man3f/. \
-		|| die "Failed to move man pages"
-
+	dodir /usr/{lib,share} /usr/share/man/man3
+	einstall MANDIR=${D}usr/share/man || die "Failed to install man pages"
+	if use fortran ; then
+	    dodir /usr/share/man/man3f
+	    mv ${D}usr/share/man/man3/netcdf.3f ${D}usr/share/man/man3f/ \
+		|| die "Failed to move man page"
+	    dosed "s:NETCDF 3:NETCDF 3F:g" /usr/share/man/man3f/netcdf.3f \
+		|| die "dosed failed"
+	    if [ ${FORTRANC} == gfortran -o ${FORTRANC} == pgf90 ] ; then
+		dodir /usr/share/man/man3f90
+		mv ${D}usr/share/man/man3/netcdf.3f90 ${D}usr/share/man/man3f90/ \
+		    || die "Failed to move man page"
+	    fi
+	    dodoc fortran/cfortran.doc || die "Failed to install fortran docs"
+	fi
 	dodoc COPYRIGHT MANIFEST README RELEASE_NOTES VERSION \
-		fortran/cfortran.doc || die "Failed to install docs"
+		|| die "Failed to install docs"
 }