sci-libs/shogun: 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 8009D6F070EB7916)

3 files changed, 24 insertions, 19 deletions

diff --git a/sci-libs/shogun/ChangeLog b/sci-libs/shogun/ChangeLog
index a222d3e00229..70fc401cdb6b 100644
--- a/sci-libs/shogun/ChangeLog
+++ b/sci-libs/shogun/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/shogun
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/shogun/ChangeLog,v 1.4 2012/08/04 20:51:03 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/shogun/ChangeLog,v 1.5 2013/02/21 21:24:38 jlec Exp $
+
+  21 Feb 2013; Justin Lecher <jlec@gentoo.org> shogun-1.1.0.ebuild,
+  metadata.xml:
+  Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config
 
   04 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org>
   +files/shogun-1.1.0-as-needed.patch, shogun-1.1.0.ebuild:
diff --git a/sci-libs/shogun/metadata.xml b/sci-libs/shogun/metadata.xml
index 36c41b823e70..5722adc1ff45 100644
--- a/sci-libs/shogun/metadata.xml
+++ b/sci-libs/shogun/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
    SHOGUN - is a new machine learning toolbox with focus on large
    scale kernel methods and especially on Support Vector Machines
    (SVM) with focus to bioinformatics. It provides a generic SVM
@@ -21,14 +21,14 @@
    (e.g. substracting the mean) can be attached to each feature object
    allowing for on-the-fly pre-processing.
 </longdescription>
-	<use>
-		<flag name="arpack">Enable support for <pkg>sci-libs/arpack</pkg></flag>
-		<flag name="glpk">Enable support for <pkg>sci-mathematics/glpk</pkg></flag>
-		<flag name="json">Enable support for parsing JSON format</flag>
-		<flag name="lpsolve">Enable support for Linear Programming Solver</flag>
-		<flag name="R">Enable support for <pkg>dev-lang/R</pkg></flag>
-		<flag name="octave">Enable support for <pkg>sci-mathematics/octave</pkg></flag>
-		<flag name="snappy">Enable support for snappy compression</flag>
-		<flag name="superlu">Enable support for <pkg>sci-libs/superlu</pkg></flag>
-	</use>
+  <use>
+    <flag name="arpack">Enable support for <pkg>sci-libs/arpack</pkg></flag>
+    <flag name="glpk">Enable support for <pkg>sci-mathematics/glpk</pkg></flag>
+    <flag name="json">Enable support for parsing JSON format</flag>
+    <flag name="lpsolve">Enable support for Linear Programming Solver</flag>
+    <flag name="R">Enable support for <pkg>dev-lang/R</pkg></flag>
+    <flag name="octave">Enable support for <pkg>sci-mathematics/octave</pkg></flag>
+    <flag name="snappy">Enable support for snappy compression</flag>
+    <flag name="superlu">Enable support for <pkg>sci-libs/superlu</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/shogun/shogun-1.1.0.ebuild b/sci-libs/shogun/shogun-1.1.0.ebuild
index 0ce734dccaa0..b0cc54e900fb 100644
--- a/sci-libs/shogun/shogun-1.1.0.ebuild
+++ b/sci-libs/shogun/shogun-1.1.0.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-libs/shogun/shogun-1.1.0.ebuild,v 1.4 2012/08/04 20:51:03 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/shogun/shogun-1.1.0.ebuild,v 1.5 2013/02/21 21:24:38 jlec Exp $
 
 EAPI=4
 
@@ -19,9 +19,10 @@ LICENSE="GPL-3 free-noncomm"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="arpack bzip2 doc examples glpk gzip hdf5 json lapack lpsolve mono lua lzma
-	lzo java R ruby	octave python readline snappy static-libs superlu test xml"
+	lzo java R ruby octave python readline snappy static-libs superlu test xml"
 
-RDEPEND="sci-libs/gsl
+RDEPEND="
+	sci-libs/gsl
 	sys-libs/zlib
 	arpack? ( sci-libs/arpack )
 	bzip2? ( app-arch/bzip2 )
@@ -67,7 +68,7 @@ src_prepare() {
 	sed -i \
 		-e 's/dist-packages/site-packages/g' \
 		-e '/^COMP_OPTS=/d' \
-		-e "s:-llapack -lcblas:$(pkg-config --libs cblas lapack):g" \
+		-e "s:-llapack -lcblas:$($(tc-getPKG_CONFIG) --libs cblas lapack):g" \
 		configure || die
 
 	# disable ldconfig which violates sandbox