summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-12-16 12:59:33 +0000
committerJustin Lecher <jlec@gentoo.org>2011-12-16 12:59:33 +0000
commit03d8c8f2a9b4a900a3de4fbedbadb17078cebd78 (patch)
tree41e3aaeebaa1dc70daac0b30e2abccc8b4da5c1f /sci-chemistry
parentStable for AMD64, wrt bug #393981 (diff)
downloadgentoo-2-03d8c8f2a9b4a900a3de4fbedbadb17078cebd78.tar.gz
gentoo-2-03d8c8f2a9b4a900a3de4fbedbadb17078cebd78.tar.bz2
gentoo-2-03d8c8f2a9b4a900a3de4fbedbadb17078cebd78.zip
Add missing die, use pkg-config for gsl detection.
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/eden/ChangeLog7
-rw-r--r--sci-chemistry/eden/eden-5.3-r1.ebuild16
2 files changed, 14 insertions, 9 deletions
diff --git a/sci-chemistry/eden/ChangeLog b/sci-chemistry/eden/ChangeLog
index cc43cc92355e..7c7e7245a986 100644
--- a/sci-chemistry/eden/ChangeLog
+++ b/sci-chemistry/eden/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-chemistry/eden
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/eden/ChangeLog,v 1.13 2010/09/18 15:53:18 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/eden/ChangeLog,v 1.14 2011/12/16 12:59:33 jlec Exp $
+
+ 16 Dec 2011; Justin Lecher <jlec@gentoo.org> eden-5.3-r1.ebuild:
+ Add missing die, use pkg-config for gsl detection.
*eden-5.3-r1 (18 Sep 2010)
diff --git a/sci-chemistry/eden/eden-5.3-r1.ebuild b/sci-chemistry/eden/eden-5.3-r1.ebuild
index 46af00db9dd2..d63a2f1d2a19 100644
--- a/sci-chemistry/eden/eden-5.3-r1.ebuild
+++ b/sci-chemistry/eden/eden-5.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/eden/eden-5.3-r1.ebuild,v 1.1 2010/09/18 15:53:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/eden/eden-5.3-r1.ebuild,v 1.2 2011/12/16 12:59:33 jlec Exp $
EAPI="3"
@@ -9,8 +9,9 @@ PYTHON_DEPEND="2"
inherit eutils multilib python toolchain-funcs
MY_P="${PN}_V${PV}"
+
DESCRIPTION="A crystallographic real-space electron-density refinement and optimization program"
-HOMEPAGE="http://www.gromacs.org/pipermail/eden-users"
+HOMEPAGE="http://www.gromacs.org/pipermail/eden-users/"
SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
LICENSE="GPL-2"
@@ -21,7 +22,8 @@ IUSE="double-precision"
RDEPEND="
sci-libs/fftw:2.1
sci-libs/gsl"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
S="${WORKDIR}/${PN}"
@@ -40,10 +42,11 @@ src_prepare() {
-e "s:^\(LIB.*=.*\$(FFTW)/\).*:\1$(get_libdir):g" \
-e "s:^\(BIN.*=\).*:\1 ${D}usr/bin:g" \
-e "s:^\(CFLAGS.*=\).*:\1 ${CFLAGS}:g" \
+ -e "s:-lgsl -lgslcblas:$(pkg-config --libs gsl):g" \
${SRC}/Makefile || die
if ! use double-precision; then
- sed -i -e "s:^\(DOUBLESWITCH.*=\).*:\1 OFF:g" ${SRC}/Makefile
+ sed -i -e "s:^\(DOUBLESWITCH.*=\).*:\1 OFF:g" ${SRC}/Makefile || die
EXE="seden"
else
EXE="deden"
@@ -51,8 +54,7 @@ src_prepare() {
}
src_compile() {
- cd ${SRC}
- emake CC=$(tc-getCC) || die "emake failed"
+ emake CC=$(tc-getCC) -C ${SRC} || die "emake failed"
}
src_install() {