* [gentoo-commits] gentoo-x86 commit in sci-chemistry/refmac: ChangeLog refmac-5.5.0110-r2.ebuild refmac-5.5.0110-r3.ebuild refmac-5.6.0117.ebuild refmac-5.6.0110.ebuild refmac-5.6.0116.ebuild
@ 2011-06-21 7:55 Justin Lecher (jlec)
0 siblings, 0 replies; only message in thread
From: Justin Lecher (jlec) @ 2011-06-21 7:55 UTC (permalink / raw
To: gentoo-commits
jlec 11/06/21 07:55:41
Modified: ChangeLog refmac-5.5.0110-r2.ebuild
refmac-5.5.0110-r3.ebuild refmac-5.6.0117.ebuild
Removed: refmac-5.6.0110.ebuild refmac-5.6.0116.ebuild
Log:
Added fortran-2.eclass and fix for ifort and pathscale
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Revision Changes Path
1.46 sci-chemistry/refmac/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/refmac/ChangeLog?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/refmac/ChangeLog?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/refmac/ChangeLog?r1=1.45&r2=1.46
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ChangeLog 14 Jun 2011 07:03:57 -0000 1.45
+++ ChangeLog 21 Jun 2011 07:55:41 -0000 1.46
@@ -1,6 +1,11 @@
# ChangeLog for sci-chemistry/refmac
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/ChangeLog,v 1.45 2011/06/14 07:03:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/ChangeLog,v 1.46 2011/06/21 07:55:41 jlec Exp $
+
+ 21 Jun 2011; Justin Lecher <jlec@gentoo.org> refmac-5.5.0110-r2.ebuild,
+ refmac-5.5.0110-r3.ebuild, -refmac-5.6.0110.ebuild, -refmac-5.6.0116.ebuild,
+ refmac-5.6.0117.ebuild:
+ Added fortran-2.eclass and fix for ifort and pathscale
*refmac-5.6.0117 (14 Jun 2011)
1.11 sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild?r1=1.10&r2=1.11
Index: refmac-5.5.0110-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- refmac-5.5.0110-r2.ebuild 21 Apr 2011 07:08:54 -0000 1.10
+++ refmac-5.5.0110-r2.ebuild 21 Jun 2011 07:55:41 -0000 1.11
@@ -1,10 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild,v 1.10 2011/04/21 07:08:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild,v 1.11 2011/06/21 07:55:41 jlec Exp $
-EAPI="2"
+EAPI=2
-inherit base toolchain-funcs versionator
+inherit base fortran-2 flag-o-matic toolchain-funcs versionator
DESCRIPTION="Macromolecular crystallographic refinement program"
HOMEPAGE="http://www.ysbl.york.ac.uk/~garib/refmac"
@@ -25,6 +25,7 @@
virtual/blas
virtual/lapack"
DEPEND="${RDEPEND}"
+FORTRAN_STANDARD="77 90"
S="${WORKDIR}"
@@ -35,6 +36,12 @@
src_prepare() {
base_src_prepare
use test && epatch "${FILESDIR}"/$(get_version_component_range 1-2 ${PV})-test.log.patch
+ [[ ${FC} == *gfortran* ]] && \
+ append-fflags -fno-second-underscore && \
+ append-cflags -DGFORTRAN -DPROTOTYPE && \
+ append-libs -lgfortran -lgfortranbegin -lstdc++
+ [[ ${FC} == *ifort* ]] && \
+ append-libs -lstdc++
}
src_compile() {
@@ -45,9 +52,11 @@
COPTIM="${CFLAGS}" \
FOPTIM="${FFLAGS:- -O2}" \
VERSION="" \
- XFFLAGS="-fno-second-underscore" \
- LLIBCCP="-lccp4f -lccp4c -lccif $(pkg-config --libs mmdb) -lstdc++" \
+ XFFLAGS="" \
+ XCFLAGS="" \
+ LLIBCCP="-lccp4f -lccp4c -lccif $(pkg-config --libs mmdb)" \
LLIBLAPACK="$(pkg-config --libs lapack blas)" \
+ LLIBOTHERS="${LIBS}" \
${PN} libcheck || die
}
1.3 sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild?r1=1.2&r2=1.3
Index: refmac-5.5.0110-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- refmac-5.5.0110-r3.ebuild 21 Apr 2011 07:08:54 -0000 1.2
+++ refmac-5.5.0110-r3.ebuild 21 Jun 2011 07:55:41 -0000 1.3
@@ -1,10 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild,v 1.2 2011/04/21 07:08:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild,v 1.3 2011/06/21 07:55:41 jlec Exp $
-EAPI="2"
+EAPI=2
-inherit base toolchain-funcs versionator
+inherit base fortran-2 flag-o-matic toolchain-funcs versionator
DESCRIPTION="Macromolecular crystallographic refinement program"
HOMEPAGE="http://www.ysbl.york.ac.uk/~garib/refmac"
@@ -25,6 +25,7 @@
virtual/blas
virtual/lapack"
DEPEND="${RDEPEND}"
+FORTRAN_STANDARD="77 90"
S="${WORKDIR}"
@@ -36,6 +37,12 @@
src_prepare() {
base_src_prepare
use test && epatch "${FILESDIR}"/$(get_version_component_range 1-2 ${PV})-test.log.patch
+ [[ ${FC} == *gfortran* ]] && \
+ append-fflags -fno-second-underscore && \
+ append-cflags -DGFORTRAN -DPROTOTYPE && \
+ append-libs -lgfortran -lgfortranbegin -lstdc++
+ [[ ${FC} == *ifort* ]] && \
+ append-libs -lstdc++
}
src_compile() {
@@ -46,9 +53,11 @@
COPTIM="${CFLAGS}" \
FOPTIM="${FFLAGS:- -O2}" \
VERSION="" \
- XFFLAGS="-fno-second-underscore" \
- LLIBCCP="-lccp4f -lccp4c -lccif $(pkg-config --libs mmdb) -lstdc++" \
+ XFFLAGS="" \
+ XCFLAGS="" \
+ LLIBCCP="-lccp4f -lccp4c -lccif $(pkg-config --libs mmdb)" \
LLIBLAPACK="$(pkg-config --libs lapack blas)" \
+ LLIBOTHERS="${LIBS}" \
${PN} libcheck || die
}
1.2 sci-chemistry/refmac/refmac-5.6.0117.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/refmac/refmac-5.6.0117.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/refmac/refmac-5.6.0117.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/refmac/refmac-5.6.0117.ebuild?r1=1.1&r2=1.2
Index: refmac-5.6.0117.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.6.0117.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- refmac-5.6.0117.ebuild 14 Jun 2011 07:03:57 -0000 1.1
+++ refmac-5.6.0117.ebuild 21 Jun 2011 07:55:41 -0000 1.2
@@ -1,10 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.6.0117.ebuild,v 1.1 2011/06/14 07:03:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.6.0117.ebuild,v 1.2 2011/06/21 07:55:41 jlec Exp $
-EAPI="2"
+EAPI=2
-inherit base toolchain-funcs versionator
+inherit base fortran-2 flag-o-matic toolchain-funcs versionator
MY_PV="$(get_version_component_range 1-2)_source_v${PV}"
@@ -26,6 +26,7 @@
virtual/blas
virtual/lapack"
DEPEND="${RDEPEND}"
+FORTRAN_STANDARD="77 90"
S="${WORKDIR}"
@@ -36,6 +37,12 @@
src_prepare() {
base_src_prepare
use test && epatch "${FILESDIR}"/5.5-test.log.patch
+ [[ ${FC} == *gfortran* ]] && \
+ append-fflags -fno-second-underscore && \
+ append-cflags -DGFORTRAN -DPROTOTYPE && \
+ append-libs -lgfortran -lgfortranbegin -lstdc++
+ [[ ${FC} == *ifort* ]] && \
+ append-libs -lstdc++
}
src_compile() {
@@ -46,9 +53,11 @@
COPTIM="${CFLAGS}" \
FOPTIM="${FFLAGS:- -O2}" \
VERSION="" \
- XFFLAGS="-fno-second-underscore -fwhole-file" \
- LLIBCCP="-lccp4f -lccp4c -lccif $(pkg-config --libs mmdb) -lstdc++" \
+ XFFLAGS="-fwhole-file" \
+ XCFLAGS="" \
+ LLIBCCP="-lccp4f -lccp4c -lccif $(pkg-config --libs mmdb)" \
LLIBLAPACK="$(pkg-config --libs lapack blas)" \
+ LLIBOTHERS="${LIBS}" \
|| die
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-06-21 7:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-21 7:55 [gentoo-commits] gentoo-x86 commit in sci-chemistry/refmac: ChangeLog refmac-5.5.0110-r2.ebuild refmac-5.5.0110-r3.ebuild refmac-5.6.0117.ebuild refmac-5.6.0110.ebuild refmac-5.6.0116.ebuild Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox