sci-physics/cernlib: 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

5 files changed, 22 insertions, 18 deletions

diff --git a/sci-physics/cernlib/ChangeLog b/sci-physics/cernlib/ChangeLog
index 247c4b95bc20..a1806114209d 100644
--- a/sci-physics/cernlib/ChangeLog
+++ b/sci-physics/cernlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/cernlib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.32 2013/01/16 22:04:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.33 2013/02/20 16:48:39 jlec Exp $
+
+  20 Feb 2013; Justin Lecher <jlec@gentoo.org> cernlib-2006-r3.ebuild,
+  cernlib-2006-r4.ebuild, metadata.xml:
+  Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config
 
 *cernlib-2006-r5 (16 Jan 2013)
 
diff --git a/sci-physics/cernlib/Manifest b/sci-physics/cernlib/Manifest
index 19a92139a4d5..78d4cd43f7dd 100644
--- a/sci-physics/cernlib/Manifest
+++ b/sci-physics/cernlib/Manifest
@@ -9,15 +9,15 @@ DIST cernlib_2006.dfsg.2.orig.tar.gz 6152834 SHA256 f8ef612cdef0e02b69ccabbe0061
 DIST cernlib_20061220+dfsg3-1.debian.tar.gz 263187 SHA256 5613c101b0089d572a52e0a36e0a11caa04f3c2aa2d19ebff36b40e40e930eaa SHA512 dbefafa8067ba995f270d02c96d4fab21f9883ab908d7198e62941e22bf815bc546c61bf72d73db9ebfd4aa4b2c059ecff0cad18125c56b74ad700e72db767ff WHIRLPOOL 4f710523a8505b6edd18b9420753fbab0e700d5e880bede752fdb63ddbab0501b4144cbcdc7e5c0471b61b7a68b908eac835c18d921cfd5ed5e386406e5d98b4
 DIST cernlib_20061220+dfsg3-2.debian.tar.gz 257093 SHA256 54d01b7c16015586b09d54940f8e4389eb9f9a85e93be8058a2f1349a009029a SHA512 43a2ca55d42b92bfb551b029c75728e80b4c83473397b52f746d9481c7503762bc5a281732908bfeb29a64f728fed4c127ed1cb9101c16e4fb2dd28c452730ea WHIRLPOOL e11e127c2ef22c96a8f309a1828b076064b87419d7b2fa2f0e93f254582ded6ce41ca678c757921e9a732f75a4bd0392cd4edb7c0752ce04986fe8c1ee210c46
 DIST cernlib_20061220+dfsg3.orig.tar.gz 6434476 SHA256 767ecf344cb00a7b2ec232a61c67645ce0fe1a6af861e60a9aa2f96544470f1b SHA512 11fade45c5ae69c858f37a82e74ab1a69416314a23c12ec5205ee6b918590d66f26d3ae68afa466ae3109d736212968ece956a444270ddd189a27a24c0ccece8 WHIRLPOOL fce13048cff43b6abc7e52e9729f5e484ebf85b53f09e6bfbf8acd970ea13b160de6d6d9593779b6b485dfb9843dec4d2d58bac0df20dfce9809a3560eec079c
-EBUILD cernlib-2006-r3.ebuild 3315 SHA256 5cb75df9300667b0d0b86d9d4966f0cdd34b0e521106b445d185e1578e966173 SHA512 6f90a2e9fc0e1c0f8b2f5da9fe0784471ce8b32096254457e9a7421ce2e83e73c011a6dda3adcbce27112f0e8cd460ced302a1a84918fa760ff798a91bcdf587 WHIRLPOOL f9da99982c5131230047166855b0f0f510c79bfd793472240e2748da9bec5b57d2b9472d269cf4c7d3dcf391eee2a37fe87fb046e1d99ec08e23b815b43e8d98
-EBUILD cernlib-2006-r4.ebuild 2795 SHA256 1d18a62be69052be298ddf4d728390cc2562ab3db7a1dbf22cd816b513b0f842 SHA512 592c640b28e6de382ee2b267a9f208e2f26800ff14866797fc97fc079935eaf814239fb2ad3bae5450e36932865fef5212e063dc55f22f31d6a76c765dcddb70 WHIRLPOOL 8ca95b3290d79b4c7e254f31927ef111df7dd8ef9f16d866ccac56b9d6c6b35e2507c8b4626fd2f2029f66050d97d0fc2c75a1b8890a90d76dd3b53ec19fe173
+EBUILD cernlib-2006-r3.ebuild 3334 SHA256 17981aab97718b7d96b5ae2c48e7eeda26f3eb2a99fae0fd4f7ab091ee83eb2d SHA512 43dc65835fc95b707ed946845a15ea1b9d03ed397c88e1be01c45d81bbee791afbb9061d230aa983aa787823465f45ccb04f0898645c486c35c9e430d6370712 WHIRLPOOL 562619c47177bf9ef057129d55309a4897a0163cbc44540b3bb1b8cf80fd8682935f4277ce51ef799e9ddaf91658c798d58be6205a2c8241d0c5e7a81af93e3a
+EBUILD cernlib-2006-r4.ebuild 2814 SHA256 8e53e647f8664236162c5126095e0876f4d4099e55d566e448c66b837c27109d SHA512 24347e35f0c19a1ff8cf04727ca1d4b247145c62cfc8ff35c602505732b5aff2e01745278d71364dd692ff643c7883eb709ef09c0837f86c43697c7a264e6353 WHIRLPOOL 30db42b006f224da8b3f48f82484e54cb8f032312e47b71662c4b4c241e1469a669567ebf927e7a8e37caa9aaf4ebb7d401141ac8a70d4be7bcfc124b3b07b26
 EBUILD cernlib-2006-r5.ebuild 2880 SHA256 ce1c87a08c11d822eb9ac788d17f39f01c0e40aeb33d6484b2b8997c9f81bf2f SHA512 802b99e3c5bc26f4e88ca061a9b808df16376e2ec39fcfefe877793283e84a1f48c861edd7d5dbd9df57f94d139ee3a139ef80ffca2232101c5b34aba4f205b7 WHIRLPOOL 3b52756a262ac82573372db4c9a74e2c4407b1e53b8fe2241f4624a3117b0b43b06f264a2cde226efb2503e516365c0b60525d439eba1ad513b97f3a1c74cd1e
-MISC ChangeLog 5295 SHA256 4a0156342b15c014d9a6218510e4cd1dd97176ece66a2b5bd13d6c1f1a3d50db SHA512 5e7db058ad46a2a3ccef6f5f9e084ca50a30a782d57a1dc2a34c0f076336d487acb4710cd59964cdb848ac8ca51e413f23eca0972db990a3d1c5fee0a20990a0 WHIRLPOOL 747b92a08b0d63cc8a70183df879ac919a5e50a28bc4323187bd08c940e25aa1120f4b3a2ae7309da4aa1236e68738479d39fb81d2ec91ecb3797ac6e2854f15
-MISC metadata.xml 656 SHA256 ec901901c15e68b5f9e0ad0780a169643bfa0708bf2b52fc444b48f1dbab5aae SHA512 777544b686ad9aa1f229ff9895aab24744ac13cab5d0d3051c90b6125573323b732d34183a5c1e4b7b4d6e886857e1072b4b1fb32f6eceb07f573a26fa8ad384 WHIRLPOOL 2c5a046f260553a40d9a2449b837c7310944a0ada6749c71401eae2ca23a2d2827fa01c2151e930484ca1c6310f0d9784cdf13c9c342f276369fa887741d1fb8
+MISC ChangeLog 5482 SHA256 e9fb6c6c4abc3abb586a7ddf2cf45a9ac0f2eb3421703e74edc8037990d1cae4 SHA512 e2dc321909d772b7265266bbf231e1c859f9d460e3c968e570ebad4f3965d30f28157e6cdc206a69101d9c99fc268e5514c19f9211396c8893e5b5f5770d560e WHIRLPOOL ddfbb9b703ca44e20d0df45b44ad34cf591d7c6274b025f40047886b054f30fd3d6c127b8f98545c0d643350953fedecb81302bfbd989e9a04c1eb353de4d040
+MISC metadata.xml 658 SHA256 e9ebc62fd54aea3e6d7d677b225878650650ff4bca547f98b732f5a5adf8acb1 SHA512 3c45590b5caf423473f9bd20963be4c3a7c131ce81111164c002b00b0ae99125becffbd9805709584aa66c3ba8023e77108fcb3479cb4920ca4d3cb7e2440e5f WHIRLPOOL 8fe1ee941329f72717db167525a3b0c43540e690aafd39c4a74338bdf6a7799b4f836409fc675c9c30f8fda4c01e4ed508bfc05456b5697e7dc3e7fb7ea7f1a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlD3I9gACgkQ1ycZbhPLE2DXswCgsh4bj7FCOpwGKeH4k/EAkK4k
-TuIAn0YoPWMADYP+PkYcTRguCs0YJOiB
-=A5WW
+iEYEAREIAAYFAlEk/mgACgkQgAnW8HDreRZr5gCdGoOH6+ElztjM5wDLZbYscGAc
+mzMAn2XzIzpIcmYP9gZpJLNWxyFOnbaR
+=GPdW
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/cernlib/cernlib-2006-r3.ebuild b/sci-physics/cernlib/cernlib-2006-r3.ebuild
index c11ba60551ba..103d3a448feb 100644
--- a/sci-physics/cernlib/cernlib-2006-r3.ebuild
+++ b/sci-physics/cernlib/cernlib-2006-r3.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-physics/cernlib/cernlib-2006-r3.ebuild,v 1.14 2012/10/24 19:42:22 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r3.ebuild,v 1.15 2013/02/20 16:48:39 jlec Exp $
 
 EAPI=3
 
@@ -49,8 +49,8 @@ src_prepare() {
 
 	# use system blas and lapack set by gentoo framework
 	sed -i \
-		-e "s:\$DEPS -lm:$(pkg-config --libs blas):" \
-		-e "s:\$DEPS -llapack -lm:$(pkg-config --libs lapack):" \
+		-e "s:\$DEPS -lm:$($(tc-getPKG_CONFIG) --libs blas):" \
+		-e "s:\$DEPS -llapack -lm:$($(tc-getPKG_CONFIG) --libs lapack):" \
 		-e 's:`depend $d $a blas`::' \
 		-e 's:X11R6:X11:g' \
 		debian/add-ons/bin/cernlib.in || die "sed failed"
diff --git a/sci-physics/cernlib/cernlib-2006-r4.ebuild b/sci-physics/cernlib/cernlib-2006-r4.ebuild
index 9536fcbb6c6c..2f4d0f4ad29d 100644
--- a/sci-physics/cernlib/cernlib-2006-r4.ebuild
+++ b/sci-physics/cernlib/cernlib-2006-r4.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-physics/cernlib/cernlib-2006-r4.ebuild,v 1.5 2012/10/24 19:42:22 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r4.ebuild,v 1.6 2013/02/20 16:48:39 jlec Exp $
 
 EAPI=4
 
@@ -46,8 +46,8 @@ src_prepare() {
 
 	# use system blas and lapack set by gentoo framework
 	sed -i \
-		-e "s:\$DEPS -lm:$(pkg-config --libs blas):" \
-		-e "s:\$DEPS -llapack -lm:$(pkg-config --libs lapack):" \
+		-e "s:\$DEPS -lm:$($(tc-getPKG_CONFIG) --libs blas):" \
+		-e "s:\$DEPS -llapack -lm:$($(tc-getPKG_CONFIG) --libs lapack):" \
 		-e 's:`depend $d $a blas`::' \
 		-e 's:X11R6:X11:g' \
 		debian/add-ons/bin/cernlib.in || die "sed failed"
diff --git a/sci-physics/cernlib/metadata.xml b/sci-physics/cernlib/metadata.xml
index b2b80ddce18c..9db83d0ca7a4 100644
--- a/sci-physics/cernlib/metadata.xml
+++ b/sci-physics/cernlib/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-physics</herd>
-	<longdescription lang="en">
+  <herd>sci-physics</herd>
+  <longdescription lang="en">
   The CERN Program Library is a large collection of general purpose
   libraries and modules maintained and offered in both source and
   object code form on the CERN central computers. Most of these