diff options
| -rw-r--r-- | sci-chemistry/oasis/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-chemistry/oasis/oasis-4.0-r2.ebuild (renamed from sci-chemistry/oasis/oasis-4.0-r1.ebuild) | 8 | ||||
| -rw-r--r-- | sci-chemistry/oasis/oasis-4.0.ebuild | 67 |
3 files changed, 12 insertions, 71 deletions
diff --git a/sci-chemistry/oasis/ChangeLog b/sci-chemistry/oasis/ChangeLog index 5ccc6c2ce722..1401f4b319ba 100644 --- a/sci-chemistry/oasis/ChangeLog +++ b/sci-chemistry/oasis/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-chemistry/oasis # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/ChangeLog,v 1.6 2010/06/15 14:31:32 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/ChangeLog,v 1.7 2010/07/06 11:18:46 jlec Exp $ + +*oasis-4.0-r2 (06 Jul 2010) + + 06 Jul 2010; Justin Lecher <jlec@gentoo.org> -oasis-4.0.ebuild, + -oasis-4.0-r1.ebuild, +oasis-4.0-r2.ebuild: + Use FFLAGS instead of CFLAGS for compilation, Xarthisius on irc 15 Jun 2010; Justin Lecher <jlec@gentoo.org> oasis-4.0-r1.ebuild: Installing html at correct place diff --git a/sci-chemistry/oasis/oasis-4.0-r1.ebuild b/sci-chemistry/oasis/oasis-4.0-r2.ebuild index 241b41e71db7..cbbbe3fe73ea 100644 --- a/sci-chemistry/oasis/oasis-4.0-r1.ebuild +++ b/sci-chemistry/oasis/oasis-4.0-r2.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/oasis-4.0-r1.ebuild,v 1.2 2010/06/15 14:31:32 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/oasis-4.0-r2.ebuild,v 1.1 2010/07/06 11:18:46 jlec Exp $ EAPI="3" -inherit eutils multilib toolchain-funcs +inherit eutils fortran multilib +FORTRANC="ifc gfortran" MY_P="${PN}${PV}_Linux" DESCRIPTION="A direct-method program for SAD/SIR phasing" @@ -39,7 +40,8 @@ src_prepare() { src_compile() { emake \ -C src \ - F77="$(tc-getFC)" \ + F77="${FORTRANC}" \ + CFLAGS="${FFLAGS}" \ CCP4_LIB="${EPREFIX}/usr/$(get_libdir)" \ Linux || die } diff --git a/sci-chemistry/oasis/oasis-4.0.ebuild b/sci-chemistry/oasis/oasis-4.0.ebuild deleted file mode 100644 index cd63861097c7..000000000000 --- a/sci-chemistry/oasis/oasis-4.0.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/oasis-4.0.ebuild,v 1.4 2010/04/05 20:38:41 jlec Exp $ - -EAPI="3" - -inherit eutils multilib toolchain-funcs - -MY_P="${PN}${PV}_Linux" - -DESCRIPTION="A direct-method program for SAD/SIR phasing" -HOMEPAGE="http://cryst.iphy.ac.cn/Project/protein/protein-I.html" -SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/${MY_P}.zip" - -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -LICENSE="ccp4 oasis" -IUSE="examples +minimal" - -RDEPEND=" - ${RDEPEND} - sci-chemistry/ccp4-apps - sci-chemistry/pymol - sci-libs/mmdb - sci-visualization/gnuplot - !minimal? ( - sci-chemistry/solve-resolve-bin - sci-chemistry/arp-warp-bin - )" -DEPEND="sci-libs/ccp4-libs" - -S="${WORKDIR}"/${MY_P} - -src_prepare() { - rm bin/{fnp2fp,gnuplot,oasis4-0,seq} || die - epatch "${FILESDIR}"/${PV}-makefile.patch -} - -src_compile() { - emake \ - -C src \ - F77="$(tc-getFC)" \ - CCP4_LIB="${EPREFIX}/usr/$(get_libdir)" \ - Linux || die -} - -src_install() { - dobin src/{${PN},fnp2fp} || die - - exeinto /usr/$(get_libdir)/${PN} - doexe bin/*.*sh || die - - insinto /usr/$(get_libdir)/${PN}/html - doins bin/html/* || die - chmod 755 "${ED}"/usr/$(get_libdir)/${PN}/html/*.{csh,awk} || die - - if use examples; then - insinto /usr/share/${PN} - doins -r examples || die - fi - - cat >> "${T}"/25oasis <<- EOF - oasisbin="${EPREFIX}/usr/$(get_libdir)/${PN}" - EOF - - doenvd "${T}"/25oasis -} |