diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2004-04-21 18:22:51 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2004-04-21 18:22:51 +0000 |
| commit | 6b33dcf11cfa7b635dbea2ca13799b0ec962fce1 (patch) | |
| tree | dd1b91c957330943458c759eabf08a79da83b5a5 | |
| parent | keyword for amd64 (bug #48573) (Manifest recommit) (diff) | |
| download | gentoo-2-6b33dcf11cfa7b635dbea2ca13799b0ec962fce1.tar.gz gentoo-2-6b33dcf11cfa7b635dbea2ca13799b0ec962fce1.tar.bz2 gentoo-2-6b33dcf11cfa7b635dbea2ca13799b0ec962fce1.zip | |
Some wizardly bash replacements for sed by Aron Griffis <agriffis@gentoo.org> (#46816).
| -rw-r--r-- | app-sci/molden/ChangeLog | 6 | ||||
| -rw-r--r-- | app-sci/molden/molden-4.0.ebuild | 32 |
2 files changed, 20 insertions, 18 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/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 } |