summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-02-19 15:41:01 +0000
committerJustin Lecher <jlec@gentoo.org>2013-02-19 15:41:01 +0000
commitb0d1a82990e812bde6a7f114db541257b05cd77f (patch)
tree814550dad596f018d6058af7281a899a305832b6 /sci-chemistry/ambertools
parentdev-python/numpy: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of... (diff)
downloadhistorical-b0d1a82990e812bde6a7f114db541257b05cd77f.tar.gz
historical-b0d1a82990e812bde6a7f114db541257b05cd77f.tar.bz2
historical-b0d1a82990e812bde6a7f114db541257b05cd77f.zip
sci-chemistry/ambertools: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config
Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64 Manifest-Sign-Key: 0x70EB7916
Diffstat (limited to 'sci-chemistry/ambertools')
-rw-r--r--sci-chemistry/ambertools/ChangeLog8
-rw-r--r--sci-chemistry/ambertools/Manifest13
-rw-r--r--sci-chemistry/ambertools/ambertools-1.5-r1.ebuild13
-rw-r--r--sci-chemistry/ambertools/metadata.xml10
4 files changed, 24 insertions, 20 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/Manifest b/sci-chemistry/ambertools/Manifest
index 66199720bb91..0d554d75b74b 100644
--- a/sci-chemistry/ambertools/Manifest
+++ b/sci-chemistry/ambertools/Manifest
@@ -4,14 +4,13 @@ Hash: SHA256
AUX ambertools-1.5-gentoo.patch 14083 SHA256 82a83f660701c192272e79f5bab17a8a8be945d78fdab454ade3918281749922 SHA512 aac8f401a96142be8ccd20b640ad8425e637bfc319d76d3b9b5b535e9448fb78a87fa7b211d1cc6221601cb530a606e717800af76e1d6df340768eb2e1059d2c WHIRLPOOL d4a4df283ffddc35a1326c2aa992732428a4687cf0c4bcf354991396b16ee454c266b46273daeeea6c58efd8fdcdd19140c4c51eb39cedafb64ad45bf5dd28c5
DIST AmberTools-1.5.tar.bz2 121062582 SHA256 0c7d397d2e91603bb9123ae68e91af3525269e60800ced360f68c13350651d7c
DIST ambertools-1.5-bugfix_1-10.patch.xz 31708 SHA256 5773aaa8a2478ad478f0f3afafaa39669002c31ebe755c0d12ff277ce9ab8352
-EBUILD ambertools-1.5-r1.ebuild 3462 SHA256 975df0aae8c7a263f6763bd466154909d1ba05c38d89991f83d8a29707f1ec32 SHA512 c233cab094ec75daacaae4acac3617821a41cd57366f95711436724e93a47d4e44c8aca51e1aab61c00043878c8569703efd6c81a641e1271f1265e4053014d7 WHIRLPOOL df2608675c1bdb3ee641731cf3e1f5d3238040f0b2350d21d3b60b6612c95bf338ae64ffe554dc83434cb7ef234294cd7797cbf771bd878a6803f4baca49b992
-MISC ChangeLog 710 SHA256 524a2337221539826a4abae272a20d801aac754512d447d78ade5fd913bc4ba5 SHA512 04ddb2431ec5fb1391696c2f47a400dbe2aff720273823dc12c5d48c8bbd10bcb2fcb0162e6e69332967c782b70973548e555b90b09c0cbacefc38e15cbd7b91 WHIRLPOOL 2ea07f57f44ea121ba40145ed76498694626ddb1bf59f6d61d8b53d35298b49d6b56ca42de68320593e5561c506a7086a04454d8e4588c2a6c3e69ad16c1962c
-MISC metadata.xml 262 SHA256 3545a7acb49dae4eeb1e9934f6ab2a1dfbe2e1b772fe9a503cf0b6fa1f5457de SHA512 a49fb1b9b981192f41e43a4120d8f5ac488982eebcb4f0fe5d23a50183e781574e8acb3dc2482036c0011836abfdd65a61f07756d8a99f0ebd48dba49e04a3db WHIRLPOOL 6426916c89261f8d4a98aadc8e37bf7689f9e73d387786e9e17ed6d743732093df55b490dcacc599e32eeec43a26d4d486cee6cb9316594389684ebfa8a364dc
+EBUILD ambertools-1.5-r1.ebuild 3493 SHA256 aa19c4acc748cf141a4ff04252dbdff40d3ed703ad69436217c146f7dbbed765 SHA512 a879d6c44a323c5bdbd70028added53a32b20fa1539f10605160ece1ab779d71f591bef1ed0e6b62fc74d724746c05a019d741583409c31e978b4609965cc485 WHIRLPOOL 8c2bf773a82f3c5428807c92ca835750c2326fed37d74adf1ba8ca4c04dfad7b6b85f51f03c59aef8b8bc348702046d33b6b5f8e785190da3daa8f34ab2d953e
+MISC ChangeLog 879 SHA256 c1e50df76474d92bdd99d60ab2b0e284a7ddc48b3310b2f520a704a48f18eb1c SHA512 15b2fdd3cbe0d1dbe17e6b8fd8ddd5fefd9065ffefddee6972759ddda3cb618bb9d03a9e7ff7468fe7716d17c7bc143dae8ff1829fe30d10e101b2fe26471572 WHIRLPOOL e4b56458df570d3db597b8d33b5cf70e46b4cb6a7630f55d64130804718c30fa5e452766af92c4aa8daa94c88a58d047a348589c57760e388a1b54fb9f8a997d
+MISC metadata.xml 269 SHA256 8fbfe339de5a6cef42f351c22b3519587a9c019f59453740830b10e33e0cc1ac SHA512 d9923091d35eed9ec0b0aebe3c71bde73723962856def5ee2d4a532d75b6bd83d19f88951ebf4fdce14ca5c8bac811938cbf708dfad66970920196262ebbdcad WHIRLPOOL da16a10710846d4aafab72cc29a29d54b164703b0b10e1279bba95f354c42186621434a98a9aa20b2baa099697e1ead6bb2b3d2737a878a3715ebfbb4e6636d9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
-iEYEAREIAAYFAlCA/iAACgkQgAnW8HDreRYU/wCfeHHrHeOemeQjEc8DoEFfiA1E
-DesAmQG5fgOXf3wkNN7ULAPHbnS3Ls4/
-=8rz0
+iEYEAREIAAYFAlEjnQ0ACgkQgAnW8HDreRaXNgCfYx4hFgYCEJTsHCvHGvR5D3z/
+59cAmwXE+pNjRLaFp5mvRqCivkbXhFdy
+=P4em
-----END PGP SIGNATURE-----
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>