Some wizardly bash replacements for sed by Aron Griffis <agriffis@gentoo.org> (#46816).

3 files changed, 24 insertions, 22 deletions

diff --git a/app-sci/molden/ChangeLog b/app-sci/molden/ChangeLog
index dd34375c6445..35cde6edd38d 100644
--- a/app-sci/molden/ChangeLog
+++ b/app-sci/molden/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-sci/molden
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/molden/ChangeLog,v 1.5 2004/04/05 03:09:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/molden/ChangeLog,v 1.6 2004/04/21 18:22:51 spyderous Exp $
+
+  21 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; molden-4.0.ebuild:
+  Some wizardly bash replacements for sed by Aron Griffis <agriffis@gentoo.org>
+  (#46816).
 
   04 Apr 2004; Aron Griffis <agriffis@gentoo.org> molden-3.9.ebuild,
   molden-4.0.ebuild:
diff --git a/app-sci/molden/Manifest b/app-sci/molden/Manifest
index 11e98e5e9346..b825ed07947d 100644
--- a/app-sci/molden/Manifest
+++ b/app-sci/molden/Manifest
@@ -1,7 +1,7 @@
+MD5 41e577a086a59ad35df46cecab16bfb2 molden-3.9.ebuild 1474
+MD5 af1bfbb0777267a03e889b08173f2757 metadata.xml 248
+MD5 35013dc5836839c660cbfcc7b5ff7a8f ChangeLog 1172
+MD5 213e3286074e79c8192724944fc39c0e molden-4.0.ebuild 1537
 MD5 d06154ddfaab5d99bd967f2ca2b53652 files/digest-molden-3.9 61
 MD5 a7a0b16c6ab47f386e92f719c1eb6966 files/molden-3.9-fixMakefile.patch 1232
 MD5 bbe8bcdbccb478cc81982616a13d5e5f files/digest-molden-4.0 61
-MD5 072bc1a8315c9eaba423adb51c0c9590 ChangeLog 1004
-MD5 af1bfbb0777267a03e889b08173f2757 metadata.xml 248
-MD5 41e577a086a59ad35df46cecab16bfb2 molden-3.9.ebuild 1474
-MD5 abee3e796c5997082ee56979485f621b molden-4.0.ebuild 1579
diff --git a/app-sci/molden/molden-4.0.ebuild b/app-sci/molden/molden-4.0.ebuild
index 4fa4915cd8b6..9e54280b39bf 100644
--- a/app-sci/molden/molden-4.0.ebuild
+++ b/app-sci/molden/molden-4.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/molden/molden-4.0.ebuild,v 1.3 2004/04/07 19:56:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/molden/molden-4.0.ebuild,v 1.4 2004/04/21 18:22:51 spyderous Exp $
 
-inherit eutils gcc
+inherit eutils gcc flag-o-matic
 
 MY_P="${PN}${PV}"
 DESCRIPTION="Display molecular density from GAMESS-UK, GAMESS-US, GAUSSIAN and Mopac/Ampac."
@@ -27,27 +27,25 @@ src_unpack() {
 	# No need to add a new identical patch
 	# assuming people don't stupidly remove 3.9 patch with 3.9
 	epatch ${FILESDIR}/${PN}-3.9-fixMakefile.patch
-	# Respect $CC
-	sed -i -e "s:^CC = cc:CC = $(gcc-getCC):g" ${S}/makefile
-	# Respect $CFLAGS
-	sed -i -e "s:^CFLAGS = :CFLAGS = ${CFLAGS} :g" ${S}/makefile
-	# Respect $FC if set
-	if [ -n "${FC}" ] ; then
-		sed -i -e "s:^FC = g77:FC = ${FC}:g" ${S}/makefile
-		sed -i -e "s:^LDR = g77:LDR = ${FC}:g" ${S}/makefile
-	fi
-	# Respect $FFLAGS if set
-	if [ -n "${FFLAGS}" ] ; then
-		sed -i -e "s:^FFLAGS =:FFLAGS = ${FFLAGS}:g" ${S}/makefile
-	fi
 }
 
 src_compile() {
+	# Use -mieee on alpha, according to the Makefile
+	use alpha && append-flags -mieee
+
+	# Honor CC, CFLAGS, FC, and FFLAGS from environment;
+	# unfortunately a bash bug prevents us from doing typeset and
+	# assignment on the same line.
+	typeset -a args
+	args=( CC="${CC} ${CFLAGS}" \
+		${FC:+FC="${FC}" LDR="${FC}"} \
+		${FFLAGS:+FFLAGS="${FFLAGS}"} )
+
 	einfo "Building Molden..."
-	emake || die "molden emake failed"
+	emake "${args[@]}" || die "molden emake failed"
 	if use opengl ; then
 		einfo "Building Molden OpenGL helper..."
-		emake moldenogl || die "moldenogl emake failed"
+		emake "${args[@]}" moldenogl || die "moldenogl emake failed"
 	fi
 }