Use FFLAGS instead of CFLAGS for compilation, Xarthisius on irc

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

4 files changed, 17 insertions, 77 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/Manifest b/sci-chemistry/oasis/Manifest
index a4eb2f8d90a4..823dadc4bb8a 100644
--- a/sci-chemistry/oasis/Manifest
+++ b/sci-chemistry/oasis/Manifest
@@ -3,14 +3,13 @@ Hash: SHA1
 
 AUX 4.0-makefile.patch 1277 RMD160 8c5a9c6feec0bbb1e80f4a1a48fd016ffc3ad77f SHA1 6d0a3503f650cafe67d5d5b1a7c0561de20c90b5 SHA256 4bafff2ae7e58a908d7203e56643122f56c0cc0ebca8a103f2ca73fefa5986ce
 DIST oasis4.0_Linux.zip 6714528 RMD160 9d5b46e06ab6b2e7e301622978056bf7b4208a79 SHA1 fab2e4556ad04556f918bae153e13a843415f0c9 SHA256 56da70ce0c2750aaddf64ad2cd7852fc341d2022209484beb356b4e73dec61ba
-EBUILD oasis-4.0-r1.ebuild 1651 RMD160 eba4841a4a793022f68d447c2e929716d075674e SHA1 278d51441a89f28b62b38d72d72de44ac68500ce SHA256 f16e642784213531ae64bf4b2c4dfb5b415d50438fd975805bedba2699c6aca3
-EBUILD oasis-4.0.ebuild 1495 RMD160 5130ac48cf7897affaa66b71abf3054bc775f141 SHA1 2cf36ac5dbd505d25042863055263be7bc7f17df SHA256 a4b5334a3e2794cf3ccdb62624750e2ea930315ac67e2bcc9fb49e58ee430f10
-MISC ChangeLog 878 RMD160 210e49d5ccfa152e66cb6c476f71f8e0bdfefe04 SHA1 22e01c0e8fefce341b96d85778ee6c0d3e554543 SHA256 6e2033a3aada833c2e129e21fc2bc09bf28a3f599a6779632480d96dfb5ee998
+EBUILD oasis-4.0-r2.ebuild 1690 RMD160 87bd8e8689d4755dc6f3ebb5d9cc374963387f5f SHA1 d860b0f9061e3abb7552d5228dc2e27d6767f09e SHA256 b4a3e6dc159e10d2ce4618c9f840c04dfc8e6646f8016ec43ad02664f7e0151d
+MISC ChangeLog 1086 RMD160 7efbf9437e501aae01b860227181d201e2cb9330 SHA1 fe714cbfbbf12f051fa6e587c4eca3afe5adce6d SHA256 093b10a33060e65e4498e37ea02f1e6634b7401f0f7ec5d4c8330afbe0ae01b8
 MISC metadata.xml 298 RMD160 a811ceba16c1dfc0bf5cd95aac1fbeda93a01140 SHA1 5da5e120e5cb3ade8f5b3f4d6c2521dbe49dc2ee SHA256 47989b12cffa652d3b2fca1b8a9ad02f4e258df562fabc458dc9782f3789a8d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwXjssACgkQgAnW8HDreRYTPwCgpe/glQQtomYbrXcNi13j2Q8q
-a1AAoJgVO4/K9LaBrlZwvy2kOVdksUsZ
-=Dqlb
+iEYEARECAAYFAkwzERwACgkQgAnW8HDreRa5/gCeO/YZ9tJTOsEDhoLzjqToMMY8
+J1gAnRB/c+ZpPlBVs9f0N2+sSTaS9u8b
+=U4bs
 -----END PGP SIGNATURE-----
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
-}