sci-mathematics/octave: 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

4 files changed, 23 insertions, 19 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 6b12f72fc788..c7410ccdcca4 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.135 2013/01/11 21:44:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.136 2013/02/21 13:30:58 jlec Exp $
+
+  21 Feb 2013; Justin Lecher <jlec@gentoo.org> octave-3.4.3-r1.ebuild,
+  metadata.xml:
+  Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config
 
   11 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org> octave-3.6.3.ebuild:
   Forgot transfig dependency
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 876b768e4838..f9179b8070de 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -8,14 +8,14 @@ AUX octave-3.6.3-legendtext.patch 406 SHA256 86e7bde6f8e4452d706257ce6af69463a05
 AUX octave-3.6.3-rcond.patch 6632 SHA256 7149a7f49915ec72d39222c0247a63cce41e1305ad718114a375c2736911e055 SHA512 62c3bd854cd8cefede58b6d7feaf94fc78544f89ba9f2d7323cc58abdcbb7001e3bb5862a33d5387f270054e7a6a3385befaff48daa523506ff43099b590526c WHIRLPOOL 2d1ac8e82f695423d5268368ab383f0824d099d27c0d20c9f6e9198ed4f048ce7318d5364ca34546893dbde7b89931b1dbbedc6d24ccc60bb06a7692f6d3cf99
 DIST octave-3.4.3.tar.bz2 15085117 SHA256 94d119cc93a38465e9c00dd36b9cc063abbda7ae8cb39407cf88a2bddc9dc148 SHA512 11cb6d9ba32b468ee8fbf86b9e1de642eb22e0864b1eee68883e3e2336b109f1a8b1bb5d81a10961a5a64e467b7112247ac28f5b951f84c5eaa5a2beff31dfe2 WHIRLPOOL d61c344e834165ba4f0ac41ef9a4f218fd558ab564c4446ae5fcfa8d185b9f0c882cf08ac924a83309d70a1b175d9284c0d56b7d98b526e9c1a30ef5d4f24fca
 DIST octave-3.6.3.tar.bz2 15602522 SHA256 e37d09550f1cb406745619a5602aa3e8a97d2fe056b5c770db9984e2fc162886 SHA512 27caf2061e32e3a50478441f7795953fbfa4d876277fa91f657d61811389c1ca96a1b956852c1957724dbc0f8a187189a537b4254f9b3b6ac8d3a4f897435de4 WHIRLPOOL a2433d957e7a97f9627f4a472f9c3ce59ba09ca1aac3d58db30e0e10bcfd3da1e123174943a7c4fb3594b843eed8d3b0c7ff33301a05a11561e4611a9295a4f3
-EBUILD octave-3.4.3-r1.ebuild 2750 SHA256 36ba35598396f0048d38fdf96d7f432b7f0a4ae23d65d820b3d962bc65cbef15 SHA512 dd5385292e992c6420fb125e3ab649b4f40cc50f48c711ec8bf513f4c302610dfbbdb4fff6136bc750617143ec33f55bf320a398a0f1e37b90b66be93daa8891 WHIRLPOOL 43b55d6e6933872bced5ee24a64b43413fbb0ff1878c5829f75d7b9f1764700df2549863b167b95a6e1947b5eec5928c27d5d3f553a627da79b75feb6d0c8d40
+EBUILD octave-3.4.3-r1.ebuild 2766 SHA256 90b6ff79229c7dbe36dcb37e4828f04bce615c67ddf580287fd90196a77c0f17 SHA512 82dc40f651313f4e55033a57d86174d2b881221707b77da3496a1805ce6b2283a4b1d7442360e38831b01e1bc9c68c093245b1e857869a7edefe24dc0609f0b8 WHIRLPOOL 5024f9d725eac14dc049c1e24fad953064a2cd03b297ae443db9e834a20d207374b84859f7a0359d52b7fd2724605e8b22d8af59f7393ef5258f8893b40374f5
 EBUILD octave-3.6.3.ebuild 3415 SHA256 4ebf488ccdf64c3a0afbc21b4e5ae8e20271ec9cd5d8a69aa86e6d12a5f3f053 SHA512 88cbd4a2ddeb9d31f14ac8e07afb0d0a64eb42a469e63944f90db81205f61b2998e2b187cb3401bd51de872a2ecc5cb75ae318065a044280ade8dfd69aa4cc25 WHIRLPOOL 8c6271c08501ea7a5389918a5f0c54cc6c15e5746693a4b1885f484fdeb5dd3586a229e1321030230f468cf1070b24fe069ccce3d7d20b1660f2e410309b5eae
-MISC ChangeLog 32299 SHA256 6eeab5c1dd0f59abae45544a73d981a2b5a9c2dee355acd4d681685f4d07f92c SHA512 9319fe1e5b206db14eb2c31f4d91e422759e051c187da178bc75d62203d5a37c34a73a2c1dbff2913fa42eea1602e16d9263867fe60fc0131ea8a18a3b3d5896 WHIRLPOOL 6db680ede2d2b272a294f397d2932709d10b9486dd7cb9b71ed371737bb90d297312a8e03dd287c920895c642421216610bb34f213e920e776d0f204c6545d1d
-MISC metadata.xml 943 SHA256 c106cb1fbc31bcbe22fec8ddc904a38461583555f5b435f107bcb3b8f75bb5a4 SHA512 4df4893813d9df6bc73b6648971ef6a97a7a4378de8fa417480a5f82c56825b50965aaebcd0fbee6ac24fd47ccf3de24695ac87d5d272abe27ef3fee50217e1b WHIRLPOOL 46ecd0bc61bb8b604930e41445d7146b63c41c109acaa2b49b54af2cf03cd487bfb83dcda017eeb59bc07d04b4f1e704447f4c7bfe6a8a0788a7d3089a28f411
+MISC ChangeLog 32462 SHA256 f20853e92f47d2f4ff4a835579900dd942115ce355fca8babd1aa295f24ecf0c SHA512 3f8dbba6abca1e8fc1cfe429d2187dc1322a040df9e7b98af839fc5a84ff798fb5351013e2ea1e96e6e0bb450b2730fb6376ae0ebc02031c56a54de8f92efe67 WHIRLPOOL 978ccb28813c2ffd99e301c80e446a042240610aa16f68b752548364519c69714b82123dbb9f2163b3868fd3998f252dfcca786de676dda846c0fea8928b81be
+MISC metadata.xml 959 SHA256 54af60069164b7969cce2ab5e613874f6cb222021c06a449401529c3258923c6 SHA512 2314a5ae45baaf959fbe19f54476c77b048a419bb838d0295b2e9e52dfde2f2255737f6de213a0a94927e125d0df2c114d7a5c1198063b4bd809f1a74e82aa6d WHIRLPOOL 4f18232a77db14b72ff00eb0fc2306cd00e914d16652610646b9d1a5f8d505a28174e615da42ab4a70467bbdf17b4db4d0e140215bba7ef243817f7787adcc32
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDwh60ACgkQ1ycZbhPLE2CcvwCfVBiYdAVPSgXC/mu6kglWSKws
-kA8An10iiQsBxYCtPUMDdTSpX+JP6g5r
-=GcKG
+iEYEAREIAAYFAlEmIZMACgkQgAnW8HDreRazogCdFPbU2eUWifQzC3zqDHAS8PKO
+nCAAn1M5+8BbzkuJBNIRU2tSbRi8ghls
+=DKa/
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml
index d18fb9aa8276..c2dde1ee64bd 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription lang='en'>
+  <herd>sci-mathematics</herd>
+  <longdescription lang="en">
   Octave is a high-level language, primarily intended for numerical
   computations.  It provides a convenient command line interface for
   solving linear and nonlinear problems numerically, and for performing
   other numerical experiments.  It may also be used as a batch-oriented
   language.
 </longdescription>
-<use>
-  <flag name='glpk'>Add support for <pkg>sci-libs/glpk</pkg> for linear programming</flag>
-  <flag name='qhull'>Add support for <pkg>sci-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
-  <flag name='qrupdate'>Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
-  <flag name='sparse'>Add enhanced support for sparse matrix algebra with SuiteSparse</flag>
-</use>
+  <use>
+    <flag name="glpk">Add support for <pkg>sci-libs/glpk</pkg> for linear programming</flag>
+    <flag name="qhull">Add support for <pkg>sci-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
+    <flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
+    <flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-mathematics/octave/octave-3.4.3-r1.ebuild b/sci-mathematics/octave/octave-3.4.3-r1.ebuild
index 7812f73c7345..d32348004f9a 100644
--- a/sci-mathematics/octave/octave-3.4.3-r1.ebuild
+++ b/sci-mathematics/octave/octave-3.4.3-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-mathematics/octave/octave-3.4.3-r1.ebuild,v 1.14 2012/05/04 07:46:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.4.3-r1.ebuild,v 1.15 2013/02/21 13:30:58 jlec Exp $
 
 EAPI=4
 inherit eutils base autotools toolchain-funcs
@@ -75,8 +75,8 @@ src_configure() {
 		--localstatedir="${EPREFIX}/var/state/octave" \
 		--enable-shared \
 		--without-hdf5 \
-		--with-blas="$(pkg-config --libs blas)" \
-		--with-lapack="$(pkg-config --libs lapack)" \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
 		$(use_enable doc docs) \
 		$(use_enable readline) \
 		$(use_with curl) \