Updated to fix exported symbols with gfortran (one less underscore).

Package-Manager: portage-2.2_rc32/cvs/Linux x86_64

3 files changed, 37 insertions, 4 deletions

diff --git a/sci-libs/libnc-dap/ChangeLog b/sci-libs/libnc-dap/ChangeLog
index 2f2442820786..260fa5971eb0 100644
--- a/sci-libs/libnc-dap/ChangeLog
+++ b/sci-libs/libnc-dap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/libnc-dap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libnc-dap/ChangeLog,v 1.3 2009/04/27 01:54:33 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libnc-dap/ChangeLog,v 1.4 2009/05/11 03:50:00 nerdboy Exp $
+
+  11 May 2009; Steve Arnold <nerdboy@gentoo.org> libnc-dap-3.7.3-r1.ebuild:
+  Updated to fix exported symbols with gfortran (one less underscore).  Only
+  supports gfortran and g77 at the moment.
 
 *libnc-dap-3.7.3-r1 (27 Apr 2009)
 
diff --git a/sci-libs/libnc-dap/Manifest b/sci-libs/libnc-dap/Manifest
index 22938ddcfd6d..6ca3c8f37353 100644
--- a/sci-libs/libnc-dap/Manifest
+++ b/sci-libs/libnc-dap/Manifest
@@ -1,5 +1,5 @@
 AUX libnc-dap-3.7.3_template-fix.patch 273 RMD160 6abafea1b044bc976efe1b93f0699fbe9cc37c52 SHA1 491d73a1af4c20abccd8f9f30461207b8616eb6c SHA256 324fcde3f2a14fc73264860b24cc3490ed250c884e387230cf6391674c6d88cf
 DIST libnc-dap-3.7.3.tar.gz 799282 RMD160 d99025ad66a54d7676fe44a6a29d93c272a2e582 SHA1 785726c7920daeb11de8989753da44e166ebd8e5 SHA256 38847e04ecb385e78241c31c327bfe8abebaef49cdc0fa1ad0c1f0b172ea0a3a
-EBUILD libnc-dap-3.7.3-r1.ebuild 3002 RMD160 5344a1e09bb7a7b91d1dc9d641009862fc6cdd45 SHA1 4c3bd40c00beace1ba9c4ee0a23f3475f8e90a00 SHA256 fd1f16a392c50958b6fd1991a542e4b63fe52ca4aaa6ab31633824ed3bdba4cd
-MISC ChangeLog 918 RMD160 605ae18f8b7169098d3ed48690202d5b2184063b SHA1 9d58ef8d0f2b2aff9336c9457b7238ae2837db44 SHA256 eb3f984a32f528d1ba9c2e1b7e3325ddf51b71b1152a163da7e73821134f0831
+EBUILD libnc-dap-3.7.3-r1.ebuild 3799 RMD160 17ea4fc0b4e1feff696b9cdcae3798ac6ab18428 SHA1 3242918829c28820857e5c8c4fa25c6ca68a9202 SHA256 913a904ba474d80d3f2a1d4878308ccdd388c11bf8254399e9bba384494231f8
+MISC ChangeLog 1115 RMD160 e5d7eb402ad156bea5c2258b7d399deabb1dfe5e SHA1 8802098dfac680718ff3c79e35bc89fa38c80e64 SHA256 c6a9b07d9e96df5dd078804f7b2d55922500039d153630589cd54330c949845e
 MISC metadata.xml 574 RMD160 f91856d6db33ab75ad7294ae979fac1bd9ce7120 SHA1 e98d2bb82144a176204b2fac54c8b79695e7a303 SHA256 5679ce3e7ca782571f94dcb77c77ab9e1cd1ceeb6753783b4b53e210c6336231
diff --git a/sci-libs/libnc-dap/libnc-dap-3.7.3-r1.ebuild b/sci-libs/libnc-dap/libnc-dap-3.7.3-r1.ebuild
index 04d7ececde23..7c53bb6caf71 100644
--- a/sci-libs/libnc-dap/libnc-dap-3.7.3-r1.ebuild
+++ b/sci-libs/libnc-dap/libnc-dap-3.7.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libnc-dap/libnc-dap-3.7.3-r1.ebuild,v 1.1 2009/04/27 01:54:33 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libnc-dap/libnc-dap-3.7.3-r1.ebuild,v 1.2 2009/05/11 03:50:00 nerdboy Exp $
 
 inherit eutils flag-o-matic fortran
 
@@ -23,6 +23,26 @@ DEPEND="${RDEPEND}
 	<=sci-libs/libdap-3.8.2"
 
 pkg_setup() {
+	if use fortran; then
+		fortran_pkg_setup
+		case "${FORTRANC}" in
+			# probably needs more compilers here, of which I have
+			# none, so feel free to provide flags for others...
+			g77)
+				export FCLAGS+="-finit-local-zero -fno-automatic \
+				    -fno-second-underscore -std=legacy -ff2c \
+				    -fall-intrinsics -static-libgfortran"
+				;;
+			*)
+				export FCLAGS+="-finit-local-zero -fno-automatic \
+				    -fno-second-underscore -std=gnu \
+				    -fall-intrinsics -static-libgfortran"
+				;;
+		esac
+	else
+		export FC=""
+	fi
+
 	if use full-test; then
 	    if [ -n "${DAP_TEST_OPTS}" ]; then
 		elog "User-specified test URL is ${DAP_TEST_OPTS}."
@@ -45,14 +65,23 @@ src_unpack() {
 	sed -i -e "s:MAX_NC_OPEN 32:MAX_NC_OPEN 128:g" \
 	    lnetcdf/{lnetcdf.h,netcdf.h} \
 	    || die "sed headers failed"
+
 	# missing definition causes unknown symbol errors
 	epatch "${FILESDIR}"/${P}_template-fix.patch
+
+	# this is specific to GNU Fortran
+	if [[ ${FORTRANC} = gfortran ]] ; then
+	    elog "updating for gfortran..."
+	    sed -i -e "s/= -Df2cFortran/= -DgFortran/" Makefile.in \
+		|| die "sed makefile.in failed"
+	fi
 }
 
 src_compile() {
 	local test_conf="${DAP_TEST_OPTS}"
 	local myconf="--disable-dependency-tracking --enable-largefile \
 	     --enable-64bit"
+	use fortran || myconf="${myconf} --disable-f77"
 	# debug can be set to 2 for extra verbosity
 	use debug && myconf="${myconf} --enable-debug=1"