sci-biology/plink: Use detected pkg-config instead of generic

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

5 files changed, 30 insertions, 24 deletions

diff --git a/sci-biology/plink/ChangeLog b/sci-biology/plink/ChangeLog
index 7de52d937314..830eb136a773 100644
--- a/sci-biology/plink/ChangeLog
+++ b/sci-biology/plink/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/plink
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/plink/ChangeLog,v 1.12 2012/07/04 09:31:26 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/plink/ChangeLog,v 1.13 2013/02/27 16:37:26 jlec Exp $
+
+  27 Feb 2013; Justin Lecher <jlec@gentoo.org> files/1.07-flags.patch,
+  plink-1.07-r1.ebuild, metadata.xml:
+  Use detected pkg-config instead of generic
 
   04 Jul 2012; Justin Lecher <jlec@gentoo.org> plink-1.07-r1.ebuild,
   +files/plink-1.07-gcc47.patch:
diff --git a/sci-biology/plink/Manifest b/sci-biology/plink/Manifest
index 4cd6179e16be..6d262b5f5597 100644
--- a/sci-biology/plink/Manifest
+++ b/sci-biology/plink/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX 1.07-flags.patch 1021 SHA256 93bdefd7707352ac10b4278064c39adc2a5a8bd94922124a076856b45647e186 SHA512 6ac1190a098b194cbf51351ef67d78d9b12fa18c199d28a6ffa10bd0be6d2095482a4beff17b9fed78f5f2afb73a0368c4c74ba06d06fc7acf359f0cf3361e82 WHIRLPOOL 92356cbf4c6ea8c2dffc4b8e24c592910ac46ef6dd3c118880b8bf460c92fc53d8280bfdaf016d69f1aeb3b49a11dc0b30ddf220bd55eb54038b4101d07e7a2b
+AUX 1.07-flags.patch 1024 SHA256 f2427054a2ceecbe6bc4a1d435918a225e71313b454cef02b412d2be5eb3b12c SHA512 6511b08ea740819e2d17bfc2168951f94d8b9ad1165b3ee0966bed8f7a4fe7fb313b9b32994d0405f613c14656125db736757fc7f2a2dd726db4c90e9a13dd6a WHIRLPOOL 4781d59a6c5fe0ea03931a9271b30d5ff41f2a4527135730db00207996d17847cbe8b7f2a06bc628092c485524e5915689e71a0a848e602b355a8c36890f50d2
 AUX plink-1.07-gcc47.patch 1825 SHA256 f3019efb2ea2f979971777b29b449a85dc404ac06771c97adfbed61fbbbda8d9 SHA512 dba53ba4e50bd2352ad2ed604570525b77bc5698259b12f618284c999efb776485e94485a1ad90b8cc1744a0aa004435f77ceb467e1fb9e475065e084938f7fe WHIRLPOOL eb07308a1412753823a65e877a3f7ce3d3e67234d534fee896981347a8f1e37b6c01c9b66c0482f4c4488da89469911fc276bb1d89aa2fd6113bffd3925ce48b
 DIST plink-1.07-src.zip 2257297 SHA256 4af56348443d0c6a1db64950a071b1fcb49cc74154875a7b43cccb4b6a7f482b SHA512 493f9f32ecd9eb20c5d11dc8ac98c47a9e695059cec3d1ad6f17465b71609577032368c0fee0d3d564e9451c3c07761e444717bec0f4628caefc587fceb1f6c3 WHIRLPOOL 01e69f605e1b52c6087dd75b506a7705d3bdb8e7dfdd0158e125f4fc4d962fad70c4ec430a139029b3b4ae91b822eb10123fab062c6552b946ec96ca7caf37da
-EBUILD plink-1.07-r1.ebuild 1208 SHA256 91c9f0ebaa06e37aa866bd0286e360662fe3ddf0e10197ce16c37d332c29c054 SHA512 3dde7596587f02f97618d8b765938987a2e3921b04283fa1eb6abf7b9b71c0aa17eddb4fe949fd7cb6a075469cb32b9e431ee8aa0891fc2c94f5144373acd652 WHIRLPOOL fbb40252f2d364f7917a290b3591378d89f28b8be98474a460a096b44bc40db1d173b8850cbcaa8eade254b63fa1baa0c02d99c0bb27589e1eb584b8d0885922
+EBUILD plink-1.07-r1.ebuild 1263 SHA256 c9fcf415f3ec686c453a5c88541fad85cbe0a184fcece98dc6481c14ad0d1a3b SHA512 2e6adaa85ad20e1171e6af6e66b087db16bf7c1f42285ffb1aada31759b3f537bd273f8c144ad7bcd481e40432ef0a523037663499c832e3914497b8c6cd950d WHIRLPOOL 5d2a58bfcf2a9116891448fa8c8484c97268254a403f1ed91c7f58185b35662931f3b26a611c77e8312ab27df42f1a48b5624b056f916b33652e1e881053ec24
 EBUILD plink-1.07.ebuild 940 SHA256 5f25e15a86ff772662d909160fe626389685705a1568cdb70a14e00e49659ee5 SHA512 5c8f4fbd9234c67acbcb2cb8b23cf3a523f2a018caf244a1dab0ce89c08f17206a8cd602b58f298641e3506e1e4a096267f64fde9de059b3ad40731835d01d39 WHIRLPOOL 6c0ec262c9d7cf611f9621422bf4c13caa02cdaba4cff765d5b67d64ede11e94ffdfe72649054eddfd1087a94251a950f4d3e7a7af5d306667c5ac20c975dd6e
-MISC ChangeLog 994 SHA256 48c57a5a2ebcdf5ffe3cf700a333432c04bfeae66d75d8545017d9579f97d58c SHA512 971843546706ea577586138dac78aa7ed294d1af513e0fd2d963f359d42bfa2fa9185e0d1ec30bc07a12a2363f9f4b6e60d8b567c42d2a93bf4646f7ab58bc40 WHIRLPOOL 2147de1f50c5d7623b31a5ca72719b2ce8058315e41a2f6be9a30dfec45572b2d63890e2b7b0227c59a8cb368831f956fe6489c0ce3d15d176f93409d9102fbc
-MISC metadata.xml 435 SHA256 f0fceedb2c7179dbdc908cad4aa34c101e38b3a7eb227c5e19e7fb3829d359e9 SHA512 08fdd61d18e1eb2d8a857f3453de14abeeaf9e1f4ebf3587132d1376865b31b3493f437123673bd3900595c4fd1c776cfc3e6acaa270a125a61ec09a3f8d4af7 WHIRLPOOL 869306cc1f0abddeeb449d5cc8c98b59a57bee314c0d4bbb273414eba10942e032ae3024d091733404d1f981a8e154206857ebd997d76ae6469c4289b26cd725
+MISC ChangeLog 1149 SHA256 782c4cfbad56190506645794f63d76c732f45c524178deae02013a425cb996be SHA512 beffad254ec11bac5566a4621393b2d3c36e3c123069577de68245276da0c8607771b735de9ef66abd364f7c62ab429f90d1bfa8a13350bc80247db635a4f3ab WHIRLPOOL 93a56b9b661119ce5eabac0df76b500258fced4ab52a2eaca7017c160f462104788ea9ac06e814e8f6bc3c4bf3f9fc1a87753f6094813219adfd725ef2aef25c
+MISC metadata.xml 448 SHA256 1caf9370a3d569649741d9b6b3dfa8332645143693ec80ab308ccbe0f3613ee9 SHA512 d04783f54571e82512764c97b1b7f5c22919635cda920b66e288fa8223f0d897dad71eef2cd7f20af7ebcc8f472805a44197b3c2e5b32a1f5a30780666432c7f WHIRLPOOL c18d28caf7f1111a962455058b776ade81f57644d5e693191bb597be0fd7d1f9e5a345ff2cfb936909a6c85dcfe212068fb06be45e15ea2500bdf0f6bcb0cf9e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk/0DXQACgkQgAnW8HDreRbnGwCgubb3S2E1fuFHgQLiWmSTTilA
-x9wAoLHy5kcaU/EKEIU+Qj7xKMbw1pA0
-=762O
+iEYEAREIAAYFAlEuNkcACgkQgAnW8HDreRZOtACgm3BbI1kFtzDjuneWk7SngsG2
+YK0AoKVp8V1n5F6WU2C7JcNXxbacN15p
+=tDRa
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/plink/files/1.07-flags.patch b/sci-biology/plink/files/1.07-flags.patch
index 2b5aca74c33b..aa130f29beb2 100644
--- a/sci-biology/plink/files/1.07-flags.patch
+++ b/sci-biology/plink/files/1.07-flags.patch
@@ -21,7 +21,7 @@ index 172c795..466f09f 100644
  
  # Misc
 -LIB_LAPACK = /usr/lib/liblapack.so.3
-+LIB_LAPACK = `pkg-config --libs lapack`
++LIB_LAPACK = `$(PKG_CONFIG) --libs lapack`
  
  
  # --------------------------------------------------------------------
diff --git a/sci-biology/plink/metadata.xml b/sci-biology/plink/metadata.xml
index 06ab26e90997..5ed9d33f08ba 100644
--- a/sci-biology/plink/metadata.xml
+++ b/sci-biology/plink/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>weaver@gentoo.org</email>
-		<name>Andrey Kislyuk</name>
-	</maintainer>
-	<herd>sci-biology</herd>
-	<use>
-		<flag name="webcheck">
+  <maintainer>
+    <email>weaver@gentoo.org</email>
+    <name>Andrey Kislyuk</name>
+  </maintainer>
+  <herd>sci-biology</herd>
+  <use>
+    <flag name="webcheck">
 			add support for online update checking every time the program starts
 		</flag>
-		<flag name="R">
+    <flag name="R">
 			add support R language
 		</flag>
-	</use>
+  </use>
 </pkgmetadata>
diff --git a/sci-biology/plink/plink-1.07-r1.ebuild b/sci-biology/plink/plink-1.07-r1.ebuild
index 6f0e5a4233d8..a4928fc1860a 100644
--- a/sci-biology/plink/plink-1.07-r1.ebuild
+++ b/sci-biology/plink/plink-1.07-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-biology/plink/plink-1.07-r1.ebuild,v 1.5 2012/07/04 09:31:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/plink/plink-1.07-r1.ebuild,v 1.6 2013/02/27 16:37:26 jlec Exp $
 
 EAPI=4
 
@@ -15,7 +15,9 @@ SLOT="0"
 IUSE="lapack -webcheck R"
 KEYWORDS="amd64 x86"
 
-DEPEND="app-arch/unzip"
+DEPEND="
+	app-arch/unzip
+	lapack? ( virtual/pkgconfig )"
 RDEPEND="
 	sys-libs/zlib
 	lapack? ( virtual/lapack )"
@@ -32,6 +34,7 @@ src_prepare() {
 	use webcheck || sed -i '/WITH_WEBCHECK =/ s/^/#/' "${S}/Makefile" || die
 	use R || sed -i '/WITH_R_PLUGINS =/ s/^/#/' "${S}/Makefile" || die
 	use lapack || sed -i '/WITH_LAPACK =/ s/^/#/' "${S}/Makefile" || die
+	tc-export PKG_CONFIG
 }
 
 src_compile() {