summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-02-19 15:41:00 +0000
committerJustin Lecher <jlec@gentoo.org>2013-02-19 15:41:00 +0000
commitcc032c59b07f0f1ebf8c3dbc86e7df5b02b6b327 (patch)
treed623f2195a3d1628b787b715a2bf8e10fc6aa755 /sci-chemistry/ambertools
parentdev-python/numpy: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of... (diff)
downloadgentoo-2-cc032c59b07f0f1ebf8c3dbc86e7df5b02b6b327.tar.gz
gentoo-2-cc032c59b07f0f1ebf8c3dbc86e7df5b02b6b327.tar.bz2
gentoo-2-cc032c59b07f0f1ebf8c3dbc86e7df5b02b6b327.zip
sci-chemistry/ambertools: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'sci-chemistry/ambertools')
-rw-r--r--sci-chemistry/ambertools/ChangeLog8
-rw-r--r--sci-chemistry/ambertools/ambertools-1.5-r1.ebuild13
-rw-r--r--sci-chemistry/ambertools/metadata.xml10
3 files changed, 18 insertions, 13 deletions
diff --git a/sci-chemistry/ambertools/ChangeLog b/sci-chemistry/ambertools/ChangeLog
index b10f3ced122e..9a9103c85657 100644
--- a/sci-chemistry/ambertools/ChangeLog
+++ b/sci-chemistry/ambertools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-chemistry/ambertools
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ambertools/ChangeLog,v 1.3 2012/10/19 07:15:43 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ambertools/ChangeLog,v 1.4 2013/02/19 15:41:00 jlec Exp $
+
+ 19 Feb 2013; Justin Lecher <jlec@gentoo.org> ambertools-1.5-r1.ebuild,
+ metadata.xml:
+ Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config
19 Oct 2012; Justin Lecher <jlec@gentoo.org> ambertools-1.5-r1.ebuild,
metadata.xml:
diff --git a/sci-chemistry/ambertools/ambertools-1.5-r1.ebuild b/sci-chemistry/ambertools/ambertools-1.5-r1.ebuild
index 97412b86a44c..b6c492591219 100644
--- a/sci-chemistry/ambertools/ambertools-1.5-r1.ebuild
+++ b/sci-chemistry/ambertools/ambertools-1.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ambertools/ambertools-1.5-r1.ebuild,v 1.3 2012/10/19 07:15:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ambertools/ambertools-1.5-r1.ebuild,v 1.4 2013/02/19 15:41:00 jlec Exp $
EAPI=4
@@ -59,16 +59,17 @@ src_prepare() {
src_configure() {
cd AmberTools/src
- sed -e "s:\\\\\$(LIBDIR)/arpack.a:-larpack:g" \
- -e "s:\\\\\$(LIBDIR)/lapack.a:$(pkg-config lapack --libs) -lclapack:g" \
- -e "s:\\\\\$(LIBDIR)/blas.a:$(pkg-config blas cblas --libs):g" \
+ sed \
+ -e "s:\\\\\$(LIBDIR)/arpack.a:-larpack:g" \
+ -e "s:\\\\\$(LIBDIR)/lapack.a:$($(tc-getPKG_CONFIG) --libs lapack) -lclapack:g" \
+ -e "s:\\\\\$(LIBDIR)/blas.a:$($(tc-getPKG_CONFIG) --libs blas cblas):g" \
-e "s:\\\\\$(LIBDIR)/libdrfftw.a:${EPREFIX}/usr/$(get_libdir)/libdrfftw.a:g" \
-e "s:\\\\\$(LIBDIR)/libdfftw.a:${EPREFIX}/usr/$(get_libdir)/libdrfftw.a:g" \
-e "s:CFLAGS=:CFLAGS=${CFLAGS} -DBINTRAJ :g" \
-e "s:FFLAGS=:FFLAGS=${FFLAGS} :g" \
-e "s:LDFLAGS=$ldflags:LDFLAGS=${LDFLAGS}:g" \
-e "s:fc=g77:fc=$(tc-getFC):g" \
- -e "s:\$netcdflib:$(pkg-config netcdf --libs):g" \
+ -e "s:\$netcdflib:$($(tc-getPKG_CONFIG) --libs netcdf):g" \
-e "s:NETCDF=\$netcdf:NETCDF=netcdf.mod:g" \
-e "s:-O3::g" \
-i configure || die
diff --git a/sci-chemistry/ambertools/metadata.xml b/sci-chemistry/ambertools/metadata.xml
index b2558d8c6282..13ef0bf5a17c 100644
--- a/sci-chemistry/ambertools/metadata.xml
+++ b/sci-chemistry/ambertools/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci-chemistry</herd>
- <maintainer>
- <email>alexxy@gentoo.org</email>
- <name>Alexey Shvetsov</name>
- </maintainer>
+ <herd>sci-chemistry</herd>
+ <maintainer>
+ <email>alexxy@gentoo.org</email>
+ <name>Alexey Shvetsov</name>
+ </maintainer>
</pkgmetadata>