summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-02-06 12:02:19 +0000
committerJustin Lecher <jlec@gentoo.org>2010-02-06 12:02:19 +0000
commit2941972ebbd82227bf9a5560d6ae5f3b0d050e0c (patch)
treedd7d3f47ee63e7b70d072e8e8de77847f37f60ae /sci-chemistry/cns
parentRemove duplicates of BSD license. (diff)
downloadgentoo-2-2941972ebbd82227bf9a5560d6ae5f3b0d050e0c.tar.gz
gentoo-2-2941972ebbd82227bf9a5560d6ae5f3b0d050e0c.tar.bz2
gentoo-2-2941972ebbd82227bf9a5560d6ae5f3b0d050e0c.zip
We have to repect selection of USE="-openmp", fixed path in setup file.
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry/cns')
-rw-r--r--sci-chemistry/cns/ChangeLog7
-rw-r--r--sci-chemistry/cns/cns-1.2.1-r1.ebuild12
2 files changed, 12 insertions, 7 deletions
diff --git a/sci-chemistry/cns/ChangeLog b/sci-chemistry/cns/ChangeLog
index 7131b445f617..ae3b780e7ef1 100644
--- a/sci-chemistry/cns/ChangeLog
+++ b/sci-chemistry/cns/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-chemistry/cns
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.17 2009/07/27 06:27:51 dberkholz Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.18 2010/02/06 12:02:19 jlec Exp $
+
+ 06 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org> cns-1.2.1-r1.ebuild:
+ We have to repect selection of USE="-openmp", fixed path in setup file.
27 Jul 2009; Donnie Berkholz <dberkholz@gentoo.org>;
files/cns_solve_env_sh:
diff --git a/sci-chemistry/cns/cns-1.2.1-r1.ebuild b/sci-chemistry/cns/cns-1.2.1-r1.ebuild
index 006c3c763e8d..cc538da0e785 100644
--- a/sci-chemistry/cns/cns-1.2.1-r1.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r1.ebuild,v 1.1 2009/07/27 06:26:01 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r1.ebuild,v 1.2 2010/02/06 12:02:19 jlec Exp $
EAPI="2"
@@ -50,12 +50,12 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}"/${PV}-gentoo.patch
- append-fflags -fopenmp
+ use openmp && append-fflags -fopenmp
# the code uses Intel-compiler-specific directives
epatch "${FILESDIR}"/${PV}-allow-gcc-openmp.patch
- OMPLIB="-lgomp"
+ use openmp && OMPLIB="-lgomp"
use amd64 && \
append-cflags "-DINTEGER='long long int'" && \
@@ -118,7 +118,7 @@ src_install() {
sed -i \
-e "s:${S}:usr:g" \
-e "s:^\(setenv CNS_SOLVE.*\):\1\nsetenv CNS_ROOT /usr:g" \
- -e "s:^\(setenv CNS_SOLVE.*\):\1\nsetenv CNS_DATA \$CNS_ROOT/share/data:g" \
+ -e "s:^\(setenv CNS_SOLVE.*\):\1\nsetenv CNS_DATA \$CNS_ROOT/share/cns:g" \
-e "s:^\(setenv CNS_SOLVE.*\):\1\nsetenv CNS_DOC \$CNS_ROOT/share/doc/${PF}:g" \
-e "s:CNS_LIB \$CNS_SOLVE/libraries:CNS_LIB \$CNS_DATA/libraries:g" \
-e "s:CNS_MODULE \$CNS_SOLVE/modules:CNS_MODULE \$CNS_DATA/modules:g" \
@@ -180,9 +180,11 @@ src_install() {
}
pkg_info() {
+ if use openmp; then
elog "Set OMP_NUM_THREADS to the number of threads you want."
elog "If you get segfaults on large structures, set the GOMP_STACKSIZE"
elog "variable if using gcc (16384 should be good)."
+ fi
}
pkg_postinst() {