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

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

8 files changed, 49 insertions, 202 deletions

diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index 700c5fbfc429..2dacb6a7b51c 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/gsl
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.83 2012/05/04 08:22:52 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.84 2013/02/21 21:36:16 jlec Exp $
+
+  21 Feb 2013; Justin Lecher <jlec@gentoo.org> -gsl-1.13-r1.ebuild,
+  -gsl-1.13-r2.ebuild, gsl-1.14.ebuild, gsl-1.14-r1.ebuild, gsl-1.15.ebuild,
+  metadata.xml:
+  Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config;
+  drop old
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> gsl-1.13-r1.ebuild,
   gsl-1.13-r2.ebuild, gsl-1.14.ebuild, gsl-1.14-r1.ebuild, gsl-1.15.ebuild:
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index b656a234ba92..3be61c9f430e 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -1,16 +1,23 @@
-AUX cblas.pc.in 290 RMD160 4fc855a67383ac17b68c29d8f10307178919e217 SHA1 ec23b2092a5498beb602c9b558af8abcf5dd6358 SHA256 f47133de2f49a5ff53c8e295d03fbe8923c79cd0978cedb903cfdf7e57a873a1
-AUX eselect.cblas.gsl 216 RMD160 b2c3d435952eb73fcd02406fbd087176407c1f76 SHA1 814489871b93c2b4f7195fb9bbef1227e04c36cf SHA256 2be1ba93a0bafa73df52913f54d1c7fd299aa1cd0a98c5fbe4eac894073ebac7
-AUX gsl-1.13-cblas-vars.patch 403 RMD160 f2633cc65627656287909ec37e568e1cd96be138 SHA1 82715bea7524bda9c1bb49e1b9700163795d8b80 SHA256 207b8fe48affca2564fcfffb9a01cca257f6bd1516355fd20cd3389fbb0ced40
-AUX gsl-1.13-cblas.patch 15524 RMD160 294638c284b5b06f12405dd834b329a0755b1edd SHA1 fa0b377a7e40a9ba660909ab369fc3a744b9ae1a SHA256 77e8a1df3d27723621efd41dc817699eef21f6b77717ad96f4d929f871524890
-AUX gsl-1.14-cblas.patch 17218 RMD160 0e168003aa059083463f1f60a8767c920c328bef SHA1 730bedfe54c179984b43a8cee02ce3a6d3ee26b9 SHA256 82b88b7a8cbe6f1020a7474726e92b7ce1ec152ad7388f80f719a47d8d64699d
-AUX gsl-1.15-cblas.patch 17217 RMD160 670cc31b6fda99413d96d915f619c00e4c1c9603 SHA1 4f6387982615d3606f5c2a9a39e84f1c457db5c0 SHA256 1d69dd2d1b37abd541b86fed2b28e9f63e947f92f1b85af1c2f83074b12a8491
-DIST gsl-1.13.tar.gz 3014270 RMD160 f71507181ace425df0977a13946f12cae4b65783 SHA1 02db78b9583bc7b2a577da6f45f5dd9f23ef737e SHA256 094648a6e40854cbe006357213fb16fe3e55d048a4a4df675df36a540f8ba2c7
-DIST gsl-1.14.tar.gz 3128269 RMD160 c89a30a0b38a0c83d73ded19180d52acd56e6a52 SHA1 e1a600e4fe359692e6f0e28b7e12a96681efbe52 SHA256 3d4a47afd9a1e7c73b97791b4180d8cc4d5f0e5db6027fe06437f1f3f957fafb
-DIST gsl-1.15.tar.gz 3281134 RMD160 f34aa2a6514228f7df42fc94638286bcce5cd94c SHA1 d914f84b39a5274b0a589d9b83a66f44cd17ca8e SHA256 85b907e57902e2b7606ef3aef960302ffdd13bd9dc5b8fcbfa75e4f0bf340ea3
-EBUILD gsl-1.13-r1.ebuild 2494 RMD160 51820e0e4cc8fed8125a5d5448f6549bcf5ca905 SHA1 15b28b588f905aa88313d884d8e2421a8c9ad593 SHA256 af0b877a2fd4cec496a2d822d4e083314d977ea72459280bcfc21b94ba7d0b74
-EBUILD gsl-1.13-r2.ebuild 2890 RMD160 ea9fce1726c59a1d879a527e9e2f7cab12a14561 SHA1 cf4afd2490d07727b0ecb273990cfb0cd7c016e5 SHA256 d0bce7aab52b71777048fece9e8a4e0b8bb29dc5683bb6167f664b5725bd35e8
-EBUILD gsl-1.14-r1.ebuild 3103 RMD160 84ed1819d02523b81e4731d4c8cab3a1d03eb182 SHA1 da77359c3babc184df9756a2b2d3ba8677e10e51 SHA256 4077e272b720d1c32f24fb80af74412da404f53d84e597a01d27e30db73e5707
-EBUILD gsl-1.14.ebuild 2832 RMD160 610f639e549c92afa2b027feccd06fdcf0e03155 SHA1 98896b3c5c315b48ff06a7a4ed786f3cbbececcd SHA256 300882d44911349d2666a140d63537700134fb9ad2bddeb2ff657c48f8794c5f
-EBUILD gsl-1.15.ebuild 3144 RMD160 35bd9653643c0300a2745b11d53cdc6e7c860094 SHA1 10f9d464f0f24197fbaf55ae9e3019dbe5853a40 SHA256 cc0ff57d3a351d70e6a509458353936bc75238197921d9063e1f8dce4bdb2653
-MISC ChangeLog 12705 RMD160 ebc5f3d362acedbc0be0d60aa50a83a9254a41f2 SHA1 63832cca249481500e9aeaf96715455fbb922151 SHA256 6f0a437603651ec0abae5a00e31f562d2b630cb17078334878699433d1d5afc9
-MISC metadata.xml 1016 RMD160 e7cbe5d4daaf4f4d5eb1c81c4cc090bb3ee807f2 SHA1 d9f77f0a5a0ff8148d3eb27509dde65f1991a034 SHA256 a74ce60d545607bcbd1828028da835f69e19f306b6ea4957ca3555411d9894af
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX cblas.pc.in 290 SHA256 f47133de2f49a5ff53c8e295d03fbe8923c79cd0978cedb903cfdf7e57a873a1 SHA512 2a1dc22097e2a50fd4a797c446b32202b74e9d754c8b61c51a3789c3eb42372adcc7fb25901c468d604cc4e7961d7f11e0e5883179894047948e46879fc04719 WHIRLPOOL f8e93aa2c61d3ac08664c3162f0e754c1d6cefca0a4d4ab8ee8f763e6ec46049ff5537c7f9266200856b58ffab88fb9af115eb4be32deb99ed6d2005abcb13ec
+AUX eselect.cblas.gsl 216 SHA256 2be1ba93a0bafa73df52913f54d1c7fd299aa1cd0a98c5fbe4eac894073ebac7 SHA512 e5cd92f4e9829538642a0fed54fdf75bc579c8c20769997ec5a3ce0287993476e68fbeefec8e46162d05ea908d2e79187c15ebdd00f6558ecbd25de21ece64dc WHIRLPOOL 1a0591e670a1ca51fa6cc4b2883931a49f3da59c2c673d786f6acdb72b50b7fee22ee30f2d3c6ac864c149381c23ca5c41ba586f159830cdeff97b86cf6a03f3
+AUX gsl-1.13-cblas-vars.patch 403 SHA256 207b8fe48affca2564fcfffb9a01cca257f6bd1516355fd20cd3389fbb0ced40 SHA512 c323a2f08683f70dbb2c2e1b0d7d1706a74f71d41aad892008d381525cf4a34e0f5d120763f2cf2ad57b0ddf5ee36eeabf401299be821fec66710d12e1c0e8ca WHIRLPOOL 7a0752597eebb47dd4da359a0368c9c1a755ee607b53651d040dd3bb4f58746e234cdafd77d3e259f0f028572161719472a881441caebbf2860c1dd40d4a795e
+AUX gsl-1.13-cblas.patch 15524 SHA256 77e8a1df3d27723621efd41dc817699eef21f6b77717ad96f4d929f871524890 SHA512 ed96a576a4c218d002e091088f04e2654c651d0050e8487ef69686fd7715bf59cd56c40751bcf558314dff59ece8acb47bfa28d3a405b2ecf3fc56e30d46bdaa WHIRLPOOL c9e7146512e16a65f35687a7f832c9e0e958c6b7d7471a61527eeac3fcb616c5a16cc26ab483b8cefa194cb232a662439a06625da38cb8b86bdf0f5444ad25d5
+AUX gsl-1.14-cblas.patch 17218 SHA256 82b88b7a8cbe6f1020a7474726e92b7ce1ec152ad7388f80f719a47d8d64699d SHA512 8d009f7b7e4c6cb90864b90cc86a8c5b6b3d80d899225758683639d0e1a114355bd4f8adfb41bc9ead57990a3274cff65743c59b86fc1bc699c46a61fb31fd42 WHIRLPOOL f3b52170a5818a5d8d2812272fbbdd688626cbeb8679fb0eb16fb34a7e85a88da3302b3a4f79264e9ae39c79143f3bf5db90d678c04a2d34bcf186962e990b70
+AUX gsl-1.15-cblas.patch 17217 SHA256 1d69dd2d1b37abd541b86fed2b28e9f63e947f92f1b85af1c2f83074b12a8491 SHA512 fd099610b612b44a8b8ab8efd6350894fe7df46c94cf20e9d4377360c4cc31b11a8d9e18f6db6db9d8f4b7098b1d1569167ddb29e30396c656e381d25c1ec852 WHIRLPOOL 4794cfb018f50e59e11eb60bf11d348a7131360d757868aa9f08e75f432ee786d82143cdb3743ce3a526649cc2877b45dbe14eb49464cea9f23add0db87638b5
+DIST gsl-1.14.tar.gz 3128269 SHA256 3d4a47afd9a1e7c73b97791b4180d8cc4d5f0e5db6027fe06437f1f3f957fafb
+DIST gsl-1.15.tar.gz 3281134 SHA256 85b907e57902e2b7606ef3aef960302ffdd13bd9dc5b8fcbfa75e4f0bf340ea3 SHA512 dcea557bcd34d4ee6d2c52741c2f95702e5e6110a99f033b412489b1930d21a40ead29392f754656375801d706df01199878263e856ca3081f9a514dc3299185 WHIRLPOOL 06ffffb83ea56cf6306878063770a117e096352dda3c3dd4a7526153bc770969f61e38fa08c02ec01335bd812581db15e4e5164a7da2363741179268cb393478
+EBUILD gsl-1.14-r1.ebuild 3119 SHA256 e5e7f0e896a372bb67c4962940e81a1b842849c47ec3647d8f879d8503e1e365 SHA512 d318bf16e893209e2fd36a584e0a37ffd40d6e613533fa3569197be0da91761bdb6388aff78fe1ef5aad86c04ae76e54b758f1c8b8a43fb7c84f9c546b9c1990 WHIRLPOOL 76e7a90769b8d1342499d4e3d537ee20551d3e4417bcb34997e6efb05a035d7b6c36dc6cb2e1ccc8239a0c233f66a065d3fead7216b7e3df00f0b88c82f04e34
+EBUILD gsl-1.14.ebuild 2865 SHA256 3b25d58fd023dc99a790e243e648c4e9cfac466d86429fd400c9e139a3fcd3f6 SHA512 6de22c0b20b987de529aaaaedde6bcb40742fd7e3f31122a92614d2674f91ee994af061d9240bef4ffce386b04dc555f1c125a56f6876a987c9aaafa89769aa4 WHIRLPOOL c4e8be5f0b6d191f121ee87a8dcdf5123056cb8e7c79ea1db67d5b6606f7b967f0aad499f17260447af8808a60271213604350cc8954c463aa74dc2f73d94ccd
+EBUILD gsl-1.15.ebuild 3160 SHA256 a36ae754dfa97d532506bca516c364f4e9d3f7996dc55615263f5c6980320a35 SHA512 320d23ec1b460a52a0b85f818ba4cb1c7cad481fb743af1c9220239ce40ffd84b3d1bf384d757a98c3d3ec42d4d64352d51235cb124baf9a95d8a6a237858448 WHIRLPOOL c5e46c864f042507f2569b8b4b69d40ebcd91352d25cf7348178438e1dd06b6020aeb76940dc2081365f7fa47139da541f2255e6274b515418cea790cdd0688a
+MISC ChangeLog 12956 SHA256 7faf1922bb5622599380247006d3c01817cf46e3d1b8f4543e3bb2d1d9e33308 SHA512 73615d091073135dc41603db7d71d10055c59a33c740f2af797347a625bee38abc6a34045019a430a90ed138522f792f5e76230a2867c2d94de90c19ed9f1e76 WHIRLPOOL 006653098f5ead45cf0b89b037f6125073b0978c9ce73e0e5b30a04f673ee5223ede6320ea03b3f1ac52b10a0da767819342df98e9d30fcc95827389a7455e51
+MISC metadata.xml 1026 SHA256 6df14f9543ae80840437ac04fca5f5b4ca052a722c5146b015eeb26b1c11f1f4 SHA512 02751504e7a1563ca2008426536d03c8d5f00272519f73dccbe4df8f93fa26132fa57eee085cee9e1ce68e396893ef602283d8cd6722ba2f27bb322b8c201951 WHIRLPOOL fcbfd38fc5d1bafc3d3e08d0031b401fd5d67f1dcc1318c9ef57fa443d8998c6f9975d4f9a2b08e1d10e5e0e557511508193fd9742dc6e415067ccd723f740d8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREKAAYFAlEmk38ACgkQgAnW8HDreRZAhwCeObrwd5Yudqx7iQoDEm0XvEYP
+5cwAniq41RZjDqfU6MmLwjgjK3AOr4kz
+=gwoW
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/gsl/gsl-1.13-r1.ebuild b/sci-libs/gsl/gsl-1.13-r1.ebuild
deleted file mode 100644
index b812b987956a..000000000000
--- a/sci-libs/gsl/gsl-1.13-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.13-r1.ebuild,v 1.9 2012/05/04 08:22:52 jdhore Exp $
-
-EAPI=2
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="The GNU Scientific Library"
-HOMEPAGE="http://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="cblas-external"
-
-RDEPEND="cblas-external? ( virtual/cblas )"
-DEPEND="${RDEPEND}
-	app-admin/eselect-cblas
-	virtual/pkgconfig"
-
-pkg_setup() {
-	ESELECT_PROF="gsl"
-	# prevent to use external cblas from a previously installed gsl
-	local current_lib=$(eselect cblas show | cut -d' ' -f2)
-	if use cblas-external && [[ ${current_lib} == gsl ]]; then
-		ewarn "USE flag cblas-external is set: linking gsl with an external cblas."
-		ewarn "However the current selected external cblas is gsl."
-		ewarn "Please install and/or eselect another cblas"
-		die "Circular gsl dependency"
-	fi
-}
-
-src_prepare() {
-	filter-flags -ffast-math
-	epatch "${FILESDIR}"/${P}-cblas.patch
-	epatch "${FILESDIR}"/${P}-cblas-vars.patch
-	eautoreconf
-}
-
-src_configure() {
-	if use cblas-external; then
-		export CBLAS_LIBS="$(pkg-config --libs cblas)"
-		export CBLAS_CFLAGS="$(pkg-config --cflags cblas)"
-	fi
-	econf $(use_with cblas-external cblas)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed."
-	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
-
-	# take care of pkgconfig file for cblas implementation.
-	sed -e "s/@LIBDIR@/$(get_libdir)/" \
-		-e "s/@PV@/${PV}/" \
-		"${FILESDIR}"/cblas.pc.in > cblas.pc \
-		|| die "sed cblas.pc failed"
-	insinto /usr/$(get_libdir)/blas/gsl
-	doins cblas.pc || die "installing cblas.pc failed"
-	eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.gsl \
-		${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=cblas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${ROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/gsl/gsl-1.13-r2.ebuild b/sci-libs/gsl/gsl-1.13-r2.ebuild
deleted file mode 100644
index 73bd2904b80c..000000000000
--- a/sci-libs/gsl/gsl-1.13-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.13-r2.ebuild,v 1.3 2012/05/04 08:22:52 jdhore Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="The GNU Scientific Library"
-HOMEPAGE="http://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="cblas-external"
-
-RDEPEND="cblas-external? ( virtual/cblas )"
-DEPEND="${RDEPEND}
-	app-admin/eselect-cblas
-	virtual/pkgconfig"
-
-pkg_setup() {
-	ESELECT_PROF="gsl"
-	# prevent to use external cblas from a previously installed gsl
-	local current_lib=$(eselect cblas show | cut -d' ' -f2)
-	if use cblas-external && [[ ${current_lib} == gsl ]]; then
-		ewarn "USE flag cblas-external is set: linking gsl with an external cblas."
-		ewarn "However the current selected external cblas is gsl."
-		ewarn "Please install and/or eselect another cblas"
-		die "Circular gsl dependency"
-	fi
-}
-
-src_prepare() {
-	filter-flags -ffast-math
-	epatch "${FILESDIR}"/${P}-cblas.patch
-	epatch "${FILESDIR}"/${P}-cblas-vars.patch
-	eautoreconf
-
-	cp "${FILESDIR}"/eselect.cblas.gsl "${T}"/
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.gsl || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.cblas.gsl || die
-	fi
-}
-
-src_configure() {
-	if use cblas-external; then
-		export CBLAS_LIBS="$(pkg-config --libs cblas)"
-		export CBLAS_CFLAGS="$(pkg-config --cflags cblas)"
-	fi
-	econf $(use_with cblas-external cblas)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed."
-	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
-
-	# take care of pkgconfig file for cblas implementation.
-	sed -e "s/@LIBDIR@/$(get_libdir)/" \
-		-e "s/@PV@/${PV}/" \
-		-e "/^prefix=/s:=:=${EPREFIX}:" \
-		-e "/^libdir=/s:=:=${EPREFIX}:" \
-		"${FILESDIR}"/cblas.pc.in > cblas.pc \
-		|| die "sed cblas.pc failed"
-	insinto /usr/$(get_libdir)/blas/gsl
-	doins cblas.pc || die "installing cblas.pc failed"
-	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.gsl \
-		${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=cblas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/gsl/gsl-1.14-r1.ebuild b/sci-libs/gsl/gsl-1.14-r1.ebuild
index e29b8448913b..8cd784d678e8 100644
--- a/sci-libs/gsl/gsl-1.14-r1.ebuild
+++ b/sci-libs/gsl/gsl-1.14-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-libs/gsl/gsl-1.14-r1.ebuild,v 1.6 2012/05/04 08:22:52 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.14-r1.ebuild,v 1.7 2013/02/21 21:36:16 jlec Exp $
 
 EAPI="3"
 
@@ -53,8 +53,8 @@ src_prepare() {
 
 src_configure() {
 	if use cblas-external; then
-		export CBLAS_LIBS="$(pkg-config --libs cblas)"
-		export CBLAS_CFLAGS="$(pkg-config --cflags cblas)"
+		export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
+		export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
 	fi
 	econf \
 		--enable-shared \
diff --git a/sci-libs/gsl/gsl-1.14.ebuild b/sci-libs/gsl/gsl-1.14.ebuild
index 0715d4e49dfb..0fbdcc68eb35 100644
--- a/sci-libs/gsl/gsl-1.14.ebuild
+++ b/sci-libs/gsl/gsl-1.14.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-libs/gsl/gsl-1.14.ebuild,v 1.9 2012/05/04 08:22:52 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.14.ebuild,v 1.10 2013/02/21 21:36:16 jlec Exp $
 
 EAPI="3"
 
-inherit eutils flag-o-matic autotools
+inherit autotools eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="The GNU Scientific Library"
 HOMEPAGE="http://www.gnu.org/software/gsl/"
@@ -47,8 +47,8 @@ src_prepare() {
 
 src_configure() {
 	if use cblas-external; then
-		export CBLAS_LIBS="$(pkg-config --libs cblas)"
-		export CBLAS_CFLAGS="$(pkg-config --cflags cblas)"
+		export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
+		export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
 	fi
 	econf $(use_with cblas-external cblas)
 }
diff --git a/sci-libs/gsl/gsl-1.15.ebuild b/sci-libs/gsl/gsl-1.15.ebuild
index 6d326e787fb8..00265481fc63 100644
--- a/sci-libs/gsl/gsl-1.15.ebuild
+++ b/sci-libs/gsl/gsl-1.15.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/gsl/gsl-1.15.ebuild,v 1.4 2012/05/04 08:22:52 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.15.ebuild,v 1.5 2013/02/21 21:36:16 jlec Exp $
 
 EAPI=4
 
@@ -61,8 +61,8 @@ src_prepare() {
 
 src_configure() {
 	if use cblas-external; then
-		export CBLAS_LIBS="$(pkg-config --libs cblas)"
-		export CBLAS_CFLAGS="$(pkg-config --cflags cblas)"
+		export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
+		export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
 	fi
 	econf \
 		--enable-shared \
diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml
index a0c38aac7918..7ab2ed03c52f 100644
--- a/sci-libs/gsl/metadata.xml
+++ b/sci-libs/gsl/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">
   The GNU Scientific Library (GSL) is a collection of routines for
   numerical analysis. The routines are written from scratch by the GSL
   team in C, and present a modern API for C programmers, while allowing
@@ -15,8 +15,8 @@
   differential equations, quadrature, Monte Carlo integration, special
   functions, physical constants, and much more. 
 </longdescription>
-<use>
-  <flag name='cblas-external'>Link gsl with external cblas provided by
+  <use>
+    <flag name="cblas-external">Link gsl with external cblas provided by
     (<pkg>virtual/cblas</pkg>) instead of shipped internal version</flag>
-</use>
+  </use>
 </pkgmetadata>