aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2008-11-06 17:01:55 -0800
committerDonnie Berkholz <dberkholz@gentoo.org>2008-11-06 17:01:55 -0800
commitd4334bdf82b7204ecfe4bf0fa2b9ab40d8fabf88 (patch)
treeeede92b4f9431e19e6c69d48ff590ecf77e9a65c /sci-chemistry
parentshelx: add openmp support. (diff)
downloaddberkholz-d4334bdf82b7204ecfe4bf0fa2b9ab40d8fabf88.tar.gz
dberkholz-d4334bdf82b7204ecfe4bf0fa2b9ab40d8fabf88.tar.bz2
dberkholz-d4334bdf82b7204ecfe4bf0fa2b9ab40d8fabf88.zip
shelx: mirror tree changes.
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/shelx/Manifest2
-rw-r--r--sci-chemistry/shelx/shelx-20060317-r1.ebuild (renamed from sci-chemistry/shelx/shelx-20060317.ebuild)18
2 files changed, 13 insertions, 7 deletions
diff --git a/sci-chemistry/shelx/Manifest b/sci-chemistry/shelx/Manifest
index fee983b..88d3a06 100644
--- a/sci-chemistry/shelx/Manifest
+++ b/sci-chemistry/shelx/Manifest
@@ -2,6 +2,6 @@ AUX 20060317-autotool.patch 1218 RMD160 789e9ce9292733ad8856c9faf37aaf8f35180fac
AUX 20060317-gfortran.patch 686 RMD160 0834f5c562628db093e7cb7738be75b66b0a00d6 SHA1 58f748513c54805969d7a3155dedf4edb5a709ec SHA256 fc1b248bea13989383e12a24628c3330b781cb26b6135f2614323fad7d70cc17
DIST shelx-20060317-mp.tgz 1208177 RMD160 c7cc95ab65b3ee9323e471ac60b861f246ff67df SHA1 1631237dafefb44a595b70eca71305679d569e96 SHA256 00c3254269404b704f8ceb5ee45c0ab71b57b4bbb04f1b72a188dd18ccced7d2
DIST shelx-20060317.tgz 527162 RMD160 4a72471cca8a1df8839815ec7df35349817f7f31 SHA1 3ed6481e716059441253c84500965837deddf01b SHA256 8edb841fa71cae420e65fa87fdb3d829359a199aeead6522c72a08c4f72307d9
-EBUILD shelx-20060317.ebuild 1605 RMD160 9333bc71d4d048b26763e09838f109062a8be20f SHA1 0956f79a730d5462592e8fc030d89a0248732460 SHA256 e5ae329e2841ea87e23857f7b2a1137439b12a1750da282dde82fa32d8958183
+EBUILD shelx-20060317-r1.ebuild 1798 RMD160 233889571baae7eed9b008d4566495d5d6fe00b1 SHA1 9ed18ccb8470edfd48a9af6fc2d0ddca8646d559 SHA256 d5c98229e7b294d96c9a6ec6a17f2a5f9aeefcc885b150cd1145fde23e73b377
MISC ChangeLog 1671 RMD160 c4e80857c4155f8601c4257a89162955e6eec94d SHA1 95ee1547cf909adb1fb2892cf277897d743b5c38 SHA256 64dbd0aa40f3f236099e25350c4e106bddeae9a33552e4f7adb0b2ba71ce3558
MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
diff --git a/sci-chemistry/shelx/shelx-20060317.ebuild b/sci-chemistry/shelx/shelx-20060317-r1.ebuild
index e8eb33b..744d004 100644
--- a/sci-chemistry/shelx/shelx-20060317.ebuild
+++ b/sci-chemistry/shelx/shelx-20060317-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/shelx/shelx-20060317.ebuild,v 1.6 2007/03/15 21:49:56 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/shelx/shelx-20060317-r1.ebuild,v 1.2 2008/11/07 01:01:03 dberkholz Exp $
-inherit autotools eutils fortran
+inherit autotools eutils flag-o-matic fortran
DESCRIPTION="Programs for crystal structure determination from single-crystal diffraction data"
HOMEPAGE="http://shelx.uni-ac.gwdg.de/SHELX/"
@@ -11,7 +11,7 @@ SRC_URI="${P}.tgz
RESTRICT="fetch"
LICENSE="free-noncomm"
SLOT="0"
-KEYWORDS="~ppc x86"
+KEYWORDS="~ppc ~x86"
IUSE="dosformat openmp"
RDEPEND=""
DEPEND="${RDEPEND}"
@@ -29,8 +29,8 @@ pkg_nofetch() {
src_unpack() {
unpack ${A}
- epatch ${FILESDIR}/${PV}-autotool.patch
- epatch ${FILESDIR}/${PV}-gfortran.patch
+ epatch "${FILESDIR}"/${PV}-autotool.patch
+ epatch "${FILESDIR}"/${PV}-gfortran.patch
if use openmp; then
for i in shelxh shelxlv; do
@@ -53,6 +53,12 @@ src_unpack() {
}
src_compile() {
+ case $(tc-getF77) in
+ gfortran) append-flags -fopenmp ;;
+ ifort) append-flags -openmp ;;
+ *) ewarn "Please add any necessary OpenMP build flags to F77FLAGS." ;;
+ esac
+
econf \
FC="${FORTRANC}" \
|| die "configure failed"