sci-chemistry/psi: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config; drop old patches

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

10 files changed, 23 insertions, 153 deletions

diff --git a/sci-chemistry/psi/ChangeLog b/sci-chemistry/psi/ChangeLog
index a0f205074d1b..f75874261ea7 100644
--- a/sci-chemistry/psi/ChangeLog
+++ b/sci-chemistry/psi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-chemistry/psi
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/ChangeLog,v 1.21 2012/10/19 10:21:22 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/ChangeLog,v 1.22 2013/02/19 16:30:03 jlec Exp $
+
+  19 Feb 2013; Justin Lecher <jlec@gentoo.org>
+  -files/psi-3.3.0-parallel-make.patch, psi-3.4.0-r2.ebuild,
+  -files/3.3.0-gcc-4.3.patch, -files/add-libint-error-message.patch,
+  -files/dont-build-libint.patch, -files/try-more-compilers.patch,
+  -files/try-pthread-for-blas-lapack.patch, metadata.xml:
+  Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config;
+  drop old patches
 
   19 Oct 2012; Justin Lecher <jlec@gentoo.org> psi-3.4.0-r2.ebuild,
   metadata.xml:
diff --git a/sci-chemistry/psi/Manifest b/sci-chemistry/psi/Manifest
index 83b45d23d029..451bd33dda55 100644
--- a/sci-chemistry/psi/Manifest
+++ b/sci-chemistry/psi/Manifest
@@ -1,7 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 3.3.0-gcc-4.3.patch 506 SHA256 6107fc41da44143f12904ca0fb317c0498b36b51af933badad48e2e878471e89 SHA512 52e6c967d0e2453c3cc97858b09e979235f4ee47c4e1072bf8f44f3dc2b7bd78c07759f926968bc266f72a2658cf2532b15ba062b348d39537fd7b42a47aeec5 WHIRLPOOL 3269568bf41c8db741bfdae9e1ea065c7f53effef37971c42c17c8107f879878a642931db43b68f2a5e7dcb567675dd4b39be3dd0c4fed2ad703ca1ffeb5b865
 AUX 3.4.0-destdir.patch 1320 SHA256 17909af7b5dff643ef8ea134bf4468cd361457ba9192a1f9155a5870470af7a6 SHA512 cacd44ce2b5d0a1d7ccc2c2bb0429973b3d5d7cf145bc99ea5cbbbe693bef3bb624641761f93ba7f275f1d41fce0b14f15134167071fff4bce0542429d4d1098 WHIRLPOOL 3589a0e751d2ce2321b9495191be831d78997044bc15a07a38aecc29df08b40c0cbe4038593ede60872de3f45c441d765887b6395f546e4d9a4bd25fb378fdc0
 AUX 3.4.0-dont-build-libint.patch 432 SHA256 2bceacc5e924b033b2ef774df789cb5cd11278452da7ea2aad5d51d3b7a8d43c SHA512 db4dd3607c5fad353d9a692f38250c75f12330d6b9a10b2ea2d1ce265526310f7407c57f6846c063185f890089bcd325b13b04bf1d16742b019c0a86c766b05d WHIRLPOOL 170ec68dd4479b272e92ec38b0fb29050c30487b46cdd4537562ee099f63ba91018de9901259ca6a2bb92872c0bc738958602db8552f2c6234dbbe61865f622c
 AUX 3.4.0-fortify.patch 1889 SHA256 f901b42e64e6fdf1aed2d87bfc8efa503ab193d0464e9739be67c60daf249cd6 SHA512 b8433288aac07fe973bfcb24d17de94d2d40368c9bba4859b104c14bc2b38503307fa00145f88a00bb5185dfb1996df74786e990c132edd4f3cf4f228a03bdae WHIRLPOOL ad1eff61ef467c37a23ff986d1b3cc633c8213dc2242802c8ba49d682799c6a91bce4b64e1910fe935b68061b44ba9798488e6cab0b8fbb9707063fbd9eb3ba5
@@ -9,22 +8,16 @@ AUX 3.4.0-gcc-4.3.patch 8000 SHA256 f0b354c3ce8c65956f4ace3ed19afd9ff9b6ab43b3cf
 AUX 3.4.0-ldflags.patch 403 SHA256 edd2030d2d1f4f62d5297d7eab453fbe4d81d1b9ab8fe5f88b7ca8ca8ac70077 SHA512 208431df306d07562ba46a4f18327c8b8978452c250963c5a403e548817ea2709530675faf0b35929d0b2e6c214154a88e5e0e92066e2030c6988ec86681daf1 WHIRLPOOL f1ad2ef3984fef0d567ad443fbf53db718989c570cfc86201bb7f9563719be2f67b4a8419ce220ec8dbb04cd479d703ac80ba0ce242377d35bd943dedac4f65a
 AUX 3.4.0-man_paths.patch 603 SHA256 a8307a45d0af403e88299ea474f8af9cf26eafc3207cd991e53af1796ff8357b SHA512 d3b351b76f94f37cf7de34194b8a3fc92226e22cad5a25f9310721dddfa074ff62e6ce8aff856b59b040f0547efa5405647e664fd2e08248438592b3ca06b64d WHIRLPOOL 64a8c6262e60f57f2cad59c6fb51fc299bf888ff630652c72abfa754f5becf0806a3f0a4575186576a61e7c173b8721c4aac1149424e864fb400d380fe426b2e
 AUX 3.4.0-parallel_fix.patch 10682 SHA256 4853f395db93db2777fcda7427f4f75cc27ec03ac7ca5e238a56137c596f79c2 SHA512 44cbf4e159168ba9495f34031d409f2f22311f8c4899ca414fbcc789306aac2d8b0c165fdc0fb24907b1ddd69c79c4c2c980e2d9157a38aa94e7511914a7ff9d WHIRLPOOL 53f5ce9c1a775c284d0949ecda32897a0536ce73eb354a765cee58f8dc6d475a9240f7f6df8cd759f14f6f8597e894e1c7394d6384e4b3388f10df5dc9e4ab7c
-AUX add-libint-error-message.patch 722 SHA256 63715cab509893817c7cfb22422c3724fd02a4d0fa5065bbb5a477d8d8a23390 SHA512 999493943dffbeadabab3d666b43341d96849b7db1b128d06ce2e04437fcffe763b8a748752532f51d71de6b29bdab1a9028ac056ee22eeeda8f9ddb8486dd25 WHIRLPOOL 21145e2e8bd18075e59321c065ede2ec65e4276e9fd96dc16cec17ff824cdb10be81727ac25a3eac3749aef67deff7c9c814a3912f335c7c431e07bc78881fd7
-AUX dont-build-libint.patch 355 SHA256 57513d9f897776055dfbe14e717761de314e79409def91ccc27563a613a66e18 SHA512 17bb2431b82054ea1e53716cdcd492bbc68b2aade490bc85bac082851363d1043e882ce18aa5ea4dcc4b2f24f5c2978987275e979c4729ad9f3bb737ebb80cc8 WHIRLPOOL 8a39c357fda4a0cafc7e32115641706752d65e178f85901cd41d33c5b88dd1abbef4d7c77f24f291e6a13822bae8ff1d2b2315fcaa07f1de3edcf2a8337b320a
-AUX psi-3.3.0-parallel-make.patch 378 SHA256 1f18e9473b5d7ba8372f6bb36eb35034dedfd4bad19a80ef1867f99e5aa2e3a3 SHA512 555cf88a8932747c07e6b9ff28ddbe886c4539c57ee888ce159f35e454a7e6d8046bb67ff33211c0f8df555b7779174acaaaa473f51b2d045f3a37abc2bb9c1a WHIRLPOOL 6a0eef87d4b68e000e1f7a6829f68c81aff25d6b53d4abf688ddcf2ba2e6c23883a68e10d7d6e2a833f65917127c7b132e0193c41f8f8b6b0acc964528a3a84c
 AUX psi-3.4.0-parallel-make.patch 445 SHA256 5c3592741513bacf70e1a642e59356e1e76a98239b615fc3299cc472a09d5634 SHA512 bf574c6c9c1e1ffc8747fb51896b8f9d8b29c4796b0a06529a58a2ab1ed5ee0a4270fe071eb86ca745bad2c760701c4d9eb7f269cd390f6d9cadf4065962e52e WHIRLPOOL cf1c8fd9b46d5aa0d1237ab5612efd465f7525b9f99a09ff277792034a38d1969b69cefb162e91d6ca22573b584911d428d26d062d4a9907bcd28e8abb0cc70f
-AUX try-more-compilers.patch 401 SHA256 cb3b404ad7725700840df7602686d651f38f3d7623857af63e3556d1317aaf08 SHA512 c662b2a1a6050c271c31f8d6ddac1b3eab13314f6a45514e47327b2215767dbdfc86dc752816a80297c3a9b9dcf82792944c86ae1ebf2c9d3c3c36d6ef68b8e8 WHIRLPOOL be9e1d90ac87d2625747d62121cbb5e0d1a87c6ecdeccbe7c0cd7ea4509e819b1f01652ebdad00373e814f9948f82818a28e9fb3db05dd2ee33bae11f80d235e
-AUX try-pthread-for-blas-lapack.patch 1489 SHA256 09cf2f5bc6835697322501280de3027b932416dd939d04d0d25a9790fe02eaa5 SHA512 fb5a19dd8d57e9576e198d08e99446d1acce45a2ffc6d6d3f82a733c4bf0885b9baa1841515918234fba3fa58bdb2347fa5d4cdcd0cde51a2db2fca3a3385969 WHIRLPOOL 37ad8ef08f4676cfc2b096919832a6d80023824beed986b70074ebc35ef121420955c89878434b58939ef31889b8de990d3ce6b9e62e0dd49375a065857b9e1f
 AUX use-external-libint.patch 1359 SHA256 41faa20ba804e98a81cb6809c789c643fd17458b6f6bc95dbe6311dd2fb16713 SHA512 8b4749b0c449dbc89067eec466d3d557da86e7f2d950cc0a94409e158a31a3fb8ceafefd090168acd97975ff3ccc7859e6f2df3c2cd57a3571b79f71aca6fff7 WHIRLPOOL ea034da3121075ae566b1e99de48c6c4f39aeff8bb4b9030e5cae4cc31e402da2861bbc194b4c9f1ce242b1e4c213971700c603699a29f405eb0c69ea9ff12b4
-DIST psi-3.4.0.tar.gz 7413072 SHA256 c87a7f63cb4e34bfd1a8b3731474eb417d9933338327143415a985bcedb619d4
-EBUILD psi-3.4.0-r2.ebuild 1918 SHA256 c9d716d70edf03cdbabd175225db4fc4822ca0a64e59a7b1e4f8957645778f78 SHA512 dc04805598523b3e69ae904b449c2b3e7e2eb1a9d5b6329e833d8a3c45b1f7df4c5477dbb27e55944d051e552e855037d22adab39da90b39a58ac93124d08bbc WHIRLPOOL 46f231160cfb3df887b22e8c0f012df430e2f1f059efae84a171fde6e39d65ec47e258fb23c0721b854ad9f5d9896b4afcc4adf6e53589861f17e539be63be1c
-MISC ChangeLog 3756 SHA256 7babbc2193786f7d3f8f8116c596d40313fed6502b451c812e23584f6f450c97 SHA512 ae04fbc09809d3cc0ffd07b20e240d77a8326cea3ebcfe8f4ab8f9fdaed1d31a4551373e896e326ef91606d3a686867ab6cda7b0ee830c8071b091db348bd0d4 WHIRLPOOL ae263bea2899a637870c7872db3f305987943e9faa7853ffd7de5e8da5fb7301581338fa665a0a543a4d78f35451942689ab09f5850148e035b5d95629d077b6
-MISC metadata.xml 167 SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8 SHA512 0f65f650c91edb15011884892b3e2447ec2342f207b6b71541ec25939fed33cd219b1fcd85dd06008b56a50622973febeb63c9c6158f62435c63c4fbd3ab93bd WHIRLPOOL 0823fd1d22e4aea50bcf78c359303d804128475e21e39514505ee6528c9c46376ceafc1f13bb1cc4e1143d434397fb4ef65dc028e924fdc831521947534fd93f
+DIST psi-3.4.0.tar.gz 7413072 SHA256 c87a7f63cb4e34bfd1a8b3731474eb417d9933338327143415a985bcedb619d4 SHA512 b13d2464502545cceec3a3b6048b505b918da26730c1614617b04ee6c1d637c9f799ef7fd92ad9554fa2db87617004aa810a6a81400a04df3c06787d51654ca6 WHIRLPOOL 9c0b9de2c9fbed298eaf958f0c135cadff16eac8754d4064dba0ac2275aabd36204bcad92f90236030bc62ef9917b967653ec608e40ad631e70a0ce1c16f2127
+EBUILD psi-3.4.0-r2.ebuild 1952 SHA256 c8a46f388b103b633da40bef47d97229079258a0be80c16faec561fa5551833b SHA512 6d117ee6e8a7e875d478e83dc6047b12ffd308a16ef1e7a4c725790eebee8ee4c1bf1162e3833b3dfd8c0986da5cf09821cdbd3e30a73d03194588577ce92abd WHIRLPOOL 60feff447102cd111e635fe9a6cc6fc00e90206a151da31948e4350554c15fc5e9c1c9738b526ed30431ed56ba01fa5a51121a7d4119acd5d38cb988afb3ed36
+MISC ChangeLog 4158 SHA256 3db2c10884314e1d487a7fa4fb1e2b41c85ec40001bca9d0bb477e26d24fce95 SHA512 fbc9188aef23f62aa3b52778c6b785c9db113a74f945fc350b8783b464c010d1278c7ca4fd7862e56b96b100bde54dceca4f646aff90071064cf1254990c5882 WHIRLPOOL 8793ae81fd7e37cdc3520ed5cf7e1958232124f2cfb47670af2540220a8c5a5133b44d98bb40567fa041543aeaeebb474dc30baf056a2754c379a7d140ab5f8a
+MISC metadata.xml 168 SHA256 705462092174cd3e2e3ec1557a28108a746b7351f803d8ca6d1b925b3111c3ff SHA512 f0073fb277e20adb7781aa6ea7f8237bc2d350f0aa43f0f0cca33e02cf52b8fc117bd984c11721ac519a2637ea145976148ac1aba7335dc74c42f7b9531cbed3 WHIRLPOOL 07dd7a302e695440f5033889e5b20cada57beedf17ad33f95d45fb5c39da98bf206eaff13334c20c1c08140a9c5e6041341d29c58efc5ca59b112b60e1662318
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlCBKaMACgkQgAnW8HDreRaHQgCghQ2U/G2fJCn9UR+g3CKebTcG
-rfUAoLZ4uDtByOq3ZQX8nKN5N8giXhwc
-=8dTP
+iEYEAREIAAYFAlEjqIwACgkQgAnW8HDreRYLoACbBHHi8hcYaOYzGHfhlbIFs7Db
+gtgAnRXykPZFWJUn6oEPIGawvNtTbal0
+=Sa1u
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/psi/files/3.3.0-gcc-4.3.patch b/sci-chemistry/psi/files/3.3.0-gcc-4.3.patch
deleted file mode 100644
index 1eed612978a1..000000000000
--- a/sci-chemistry/psi/files/3.3.0-gcc-4.3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- psi3.orig/src/bin/intder/params.cc	2008-07-06 23:46:56.000000000 -0700
-+++ psi3/src/bin/intder/params.cc	2008-07-06 23:48:41.000000000 -0700
-@@ -1,3 +1,4 @@
-+#include <cstring>
- #include "params.h"
- #include "displacements.h"
- #include "intco.h"
---- psi3.orig/src/bin/intder/read_geom.cc	2008-07-06 23:46:56.000000000 -0700
-+++ psi3/src/bin/intder/read_geom.cc	2008-07-06 23:48:56.000000000 -0700
-@@ -1,3 +1,4 @@
-+#include <cstring>
- #include <stdio.h>
- #include <stdlib.h>
- #include "displacements.h"
diff --git a/sci-chemistry/psi/files/add-libint-error-message.patch b/sci-chemistry/psi/files/add-libint-error-message.patch
deleted file mode 100644
index 60fb12854455..000000000000
--- a/sci-chemistry/psi/files/add-libint-error-message.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- psi3.orig/src/lib/libint/Makefile.in	2003-11-23 11:07:51.000000000 -0800
-+++ psi3/src/lib/libint/Makefile.in	2006-02-10 22:38:37.000000000 -0800
-@@ -44,7 +44,10 @@
- $(MAKE) top_objdir=$(top_objdir_path); \
- rm -f Makefile; \
- if ! ./$(BUILD_BINARY); then \
-- cd ..; rm -fR $(TEMP_DIR); exit 1; \
-+ cd ..; \
-+ rm -fR $(TEMP_DIR); \
-+ echo "$(BUILD_BINARY) does not exist!"; \
-+ exit 1; \
- fi; \
- cp Makefile.libint Makefile; \
- ${MAKE} top_objdir=$(top_objdir_path); \
-@@ -65,7 +68,9 @@
- 	$(MKDIRS) $(libdir)
- 	$(INSTALL_DATA) $< $(libdir)
- 	$(RANLIB) $(libdir)/`basename $(TARGET)`
-+	echo Finished ranlib
- 	$(MKDIRS) $(incdir)/libint
-+	echo Finished mkdirs
- 	$(INSTALL_INCLUDE) $(TARGET_HEADERS) $(incdir)/libint
- 
- #
diff --git a/sci-chemistry/psi/files/dont-build-libint.patch b/sci-chemistry/psi/files/dont-build-libint.patch
deleted file mode 100644
index 1ad5ce74244c..000000000000
--- a/sci-chemistry/psi/files/dont-build-libint.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- psi3.orig/src/lib/Makefile.in	2004-01-19 09:09:53.000000000 -0800
-+++ psi3/src/lib/Makefile.in	2006-02-10 21:35:20.000000000 -0800
-@@ -2,7 +2,7 @@
- .PHONY:	default all install depend clean targetclean
- 
- subdirs = libipv1 libciomr libchkpt libqt libpsio libiwl libdpd \
--          libint libderiv libr12 libbasis
-+          libbasis
- 
- all: default
- 
diff --git a/sci-chemistry/psi/files/psi-3.3.0-parallel-make.patch b/sci-chemistry/psi/files/psi-3.3.0-parallel-make.patch
deleted file mode 100644
index b4466b3514dc..000000000000
--- a/sci-chemistry/psi/files/psi-3.3.0-parallel-make.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- psi3.orig/src/lib/libipv1/Makefile.in	2004-09-17 16:49:58.000000000 +0200
-+++ psi3/src/lib/libipv1/Makefile.in	2010-02-15 15:30:23.846370463 +0100
-@@ -33,10 +33,12 @@
- 
- include ../MakeRules
- 
--y.tab.c y.tab.h: parse.y
-+y.tab.h: y.tab.c 
-+
-+y.tab.c: parse.y
- 	$(YACC) -v -d $<
- 
--scan.c: scan.l
-+scan.c: scan.l y.tab.h
- 	$(LEX) -t $^ > scan.c
- 
- install_inc:: $(ALLINCLUDE)
diff --git a/sci-chemistry/psi/files/try-more-compilers.patch b/sci-chemistry/psi/files/try-more-compilers.patch
deleted file mode 100644
index 63d4618e38ea..000000000000
--- a/sci-chemistry/psi/files/try-more-compilers.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- psi3.orig/configure.in	2005-10-29 10:15:06.000000000 -0700
-+++ psi3/configure.in	2006-02-10 20:56:59.000000000 -0800
-@@ -104,9 +104,9 @@
- ######################
- 
- # potential names of compilers
--FC_LIST="g77 f77 fc f2c"
--CC_LIST="gcc cc"
--CXX_LIST="g++ c++ cxx"
-+FC_LIST="gfortran g77 f77 fc f2c ifc"
-+CC_LIST="gcc cc icc"
-+CXX_LIST="g++ c++ cxx icc"
- 
- # set up os specific options
- case $os in
diff --git a/sci-chemistry/psi/files/try-pthread-for-blas-lapack.patch b/sci-chemistry/psi/files/try-pthread-for-blas-lapack.patch
deleted file mode 100644
index d9b01edb60f0..000000000000
--- a/sci-chemistry/psi/files/try-pthread-for-blas-lapack.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- psi3.orig/configure.in	2005-10-29 10:15:06.000000000 -0700
-+++ psi3/configure.in	2006-02-10 20:56:59.000000000 -0800
-@@ -333,7 +333,7 @@
- AC_ARG_WITH(blas,[  --with-blas             which blas library to use],[
- case $withval in
-   yes)
--    BLAS='-lblas'
-+    BLAS='-lblas -lpthread'
-     ;;
-   no)
-     BLAS=''
-@@ -344,16 +344,16 @@
- esac
- ])
- if test "X$BLAS" = X; then
--  AC_CHECK_LIB(essl, DGEMM, BLAS="-lessl")
-+  AC_CHECK_LIB(essl, DGEMM, BLAS="-lessl -lpthread",, [-lpthread])
- fi
- if test "X$BLAS" = X; then
--  AC_CHECK_LIB(scs, DGEMM, BLAS="-lscs")
-+  AC_CHECK_LIB(scs, DGEMM, BLAS="-lscs -lpthread",, [-lpthread])
- fi
- if test "X$BLAS" = X; then
--  AC_CHECK_LIB(atlas, DGEMM, BLAS="-latlas")
-+  AC_CHECK_LIB(atlas, DGEMM, BLAS="-latlas -lpthread",, [-lpthread])
- fi
- if test "X$BLAS" = X; then
--  AC_CHECK_LIB(blas, DGEMM, BLAS="-lblas")
-+  AC_CHECK_LIB(blas, DGEMM, BLAS="-lblas -lpthread",, [-lpthread])
- fi
- if test "X$BLAS" = X; then
-  AC_MSG_ERROR("Did not find a BLAS library")
-@@ -363,7 +363,7 @@
- AC_ARG_WITH(lapack,[  --with-lapack           which lapack library to use],[
- case $withval in
-   yes)
--    LAPACK='-llapack'
-+    LAPACK='-llapack -lpthread'
-     ;;
-   no)
-     LAPACK=''
-@@ -382,7 +382,7 @@
-   LIBS=$CURRENT_LIBS
- fi
- if test "X$LAPACK" = X; then
--  AC_CHECK_LIB(lapack,DGEEV, LAPACK="-llapack",,$BLAS)
-+  AC_CHECK_LIB(lapack,DGEEV, LAPACK="-llapack",,$BLAS -lpthread)
- fi
- if test "X$LAPACK" = X; then
-  AC_MSG_ERROR("Did not find a LAPACK library")
diff --git a/sci-chemistry/psi/metadata.xml b/sci-chemistry/psi/metadata.xml
index e42d0af60f42..51fdedab1b38 100644
--- a/sci-chemistry/psi/metadata.xml
+++ b/sci-chemistry/psi/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+  <herd>sci-chemistry</herd>
 </pkgmetadata>
diff --git a/sci-chemistry/psi/psi-3.4.0-r2.ebuild b/sci-chemistry/psi/psi-3.4.0-r2.ebuild
index e30dc3dd3f09..a8bb737076a5 100644
--- a/sci-chemistry/psi/psi-3.4.0-r2.ebuild
+++ b/sci-chemistry/psi/psi-3.4.0-r2.ebuild
@@ -1,10 +1,10 @@
-# 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/psi/psi-3.4.0-r2.ebuild,v 1.7 2012/10/19 10:21:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/psi-3.4.0-r2.ebuild,v 1.8 2013/02/19 16:30:03 jlec Exp $
 
 EAPI=4
 
-inherit autotools-utils fortran-2 multilib
+inherit autotools-utils fortran-2 multilib toolchain-funcs
 
 DESCRIPTION="Suite of ab initio quantum chemistry programs to compute various molecular properties"
 HOMEPAGE="http://www.psicode.org/"
@@ -58,8 +58,8 @@ src_configure() {
 	local myeconfargs=(
 		--with-opt="${CXXFLAGS}"
 		--datadir="${EPREFIX}"/usr/share/${PN}
-		--with-blas="$(pkg-config blas --libs)"
-		--with-lapack="$(pkg-config --libs lapack)"
+		--with-blas="$($(tc-getPKG_CONFIG) blas --libs)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
 		)
 	autotools-utils_src_configure
 }