sci-chemistry/ccp4-apps: Use PKG_CONFIG instead of generic pkg-config

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

5 files changed, 20 insertions, 14 deletions

diff --git a/sci-chemistry/ccp4-apps/ChangeLog b/sci-chemistry/ccp4-apps/ChangeLog
index 286ea0168ac6..967b41eba6ae 100644
--- a/sci-chemistry/ccp4-apps/ChangeLog
+++ b/sci-chemistry/ccp4-apps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/ccp4-apps
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.40 2013/01/10 17:29:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.41 2013/02/27 16:53:35 jlec Exp $
+
+  27 Feb 2013; Justin Lecher <jlec@gentoo.org> files/6.1.3-lapack.patch,
+  ccp4-apps-6.1.3-r11.ebuild, ccp4-apps-6.1.3-r12.ebuild:
+  Use PKG_CONFIG instead of generic pkg-config
 
 *ccp4-apps-6.1.3-r12 (10 Jan 2013)
 
diff --git a/sci-chemistry/ccp4-apps/Manifest b/sci-chemistry/ccp4-apps/Manifest
index 9e0e758dc9e5..9069d6ea1130 100644
--- a/sci-chemistry/ccp4-apps/Manifest
+++ b/sci-chemistry/ccp4-apps/Manifest
@@ -12,7 +12,7 @@ AUX 6.1.3-dont-build-xia.patch 712 SHA256 931bf9027e503d19d1d4446ea3ada2c20044b3
 AUX 6.1.3-dont-configure.patch 4592 SHA256 817e37a623a74cc06017c5cd7b10fc5afb75242a519820825610c09ad4c91741 SHA512 7dff09383a2fa797158275827859978609c1834931fa93d8aedfd8f8d287f8a57bd69e9c53d1b8f22b656161fa540b4ea0aba92a07bc5a872a72627948c078b9 WHIRLPOOL ef1ed9b0ef5cf36520d50ab55c60c611c1de5d1d4f0fbfa6edc14f2ba0ad23a7350b2566c065f2e5643f0fb9d78ebd0f2b058bfad9b15c1d88fb7b877ad59ed0
 AUX 6.1.3-dont-make-dirs-in-configure.patch 2866 SHA256 1b5997f17526a4fd60ffa9eccf4b765aadf3a78c9394657000e0454f364240ca SHA512 bab1a6c1e0747ef7c0b9626358a9be493f5b52912eeb166532c0d4bb58f9ea0e4a81b5fde8685e9ace578608caf1c14d087f0f81d39d77b84b1082c2fba034e4 WHIRLPOOL 8645463fdc8646ca42001d850cfbc7132bef301740babb8dd2ecf6e032a20a630b5cb3599e7abae0128f0866fb4ab293d2a1ef3e3ac21a44a0146746725cf15f
 AUX 6.1.3-impl-dec.patch 4302 SHA256 73c3137ab8e20c25d1dfcfc65011a055f90eb902eede697c7dfbc5f37948eb18 SHA512 179ff6569298d6c4f931e35839ca3f271c55ed984ea599eb74415d42050cc34049279010f8b5ae30ca7ac2edd45a6cc5cb1006b504624fb9bc0a92dc180454b4 WHIRLPOOL 6c9939b087112957adacebd6138b51dbb8c0c5697b51fd76b76de65282072329251429956f267b1c2f33c1f17562ef9cdf80f5e118edc5f7685ea56b02f41a8f
-AUX 6.1.3-lapack.patch 21633 SHA256 988ca5463baab2979d4c4c713cf6cb8148123df38205083cea179767c739e71a SHA512 b0ed3b734750f788bb537e756b0e06a009adbadf7361b01f2b0fee62cf7134f10f8659161de8b2dab7d53913743af353cde39617cdaf5d00082b79c012907207 WHIRLPOOL 86b49f7ad5ac5f62581e04f2bc1519cb57a92026c591277487a2ebc26652f20927e646ff1f1a7ea179c06079152ff1364faffb6c264afd4550caef5eb6822e4e
+AUX 6.1.3-lapack.patch 21642 SHA256 8daff6a9d657fc236b73666fb80bd0be97aa3eed0b3994dc2d4aaf0c5f8997eb SHA512 daab253c1af5e91d7a8c3219aef721fd34ccbd5ce03617a5cceae4c943c295ff425d051ec6f6c86eacbd678cb77c1dec2ddd61147e434df79b5f5b6a93d74f3e WHIRLPOOL 5ec52c047a3ba5c63732f2f7f95941f4da816e6406a351c586c46fd3745cbda4dba81ceeabeac3e57e3466a84481203fc1ba08d845caf38f96751becbb55c6f7
 AUX 6.1.3-pisa.patch 714 SHA256 42a581d2a9747239c1b129dbeffc76a2532de320629dd58112a42ffde669bf12 SHA512 02e38cf79bd16d8f57dbc14d1822a4e30b15a5c1f0f467426c6a5064edea0a90379cc3e562da89d48cc07cab0e14b5b18a8fd6da09fcc50feb54c9c658c76b68 WHIRLPOOL 7e95ab8e2f0243f6e7419ae4feb38fedb85fd8b86b8674d807e1969002585abe2477e0adbaeb3611f9428b69ffe3f2e3255b15c28b697b8faa5c7df7656e8afa
 AUX 6.1.3-pythonpath.patch 2716 SHA256 41ca8ed3fc1701caa18b30f44af7475d49fc0042ee058bae3d8c8617a6d9bcc2 SHA512 e6d9560976a07f4beb8f0e8de4d151ac0c3434cc7c30b4c14bcebeaae0fd411c25023684978c67f3680ade87351c751d61e55f75ec742bd3b4442647b2227246 WHIRLPOOL 18525a440fb7456b44e58185d701d86638c58f7d5e5ec327a50d8fa6c831fc802157bc54385f9165d6ca05ce2c434260de2e1cc84a18e4cdce146f1d722c8e36
 AUX 6.1.3-rename-rapper-ng.patch 2241 SHA256 7a476133860463b91b39189aa5628607f0404224cae1273b4da1c500a845dfdb SHA512 93dd483454d5b7f9423f20e29d09d8c067fd07b40db94bc92836ea4b51b3cbf37d7bbed86290ec95cd6174a7dddc74c575965360f922f77ed835ac934dab6bba WHIRLPOOL 9015d7ac00d1a50fa73a06a86c98b61f69510a856fecaa043604db6a180a296bedba91372b89e0051e7603ba7f92bb6c5cb406674d8d68f0aa511c2eeaacf498
@@ -20,14 +20,14 @@ AUX 6.1.3-unbundle.patch 5736 SHA256 1d50917bdd3733d099cf64df651c8743ab40ce1ea19
 AUX ccp4-apps-6.1.3-tcl8.6.patch 6027 SHA256 665d21a30b78e55480c8eddd83ef2c7e77573b0bffe3cef7e48c065d2601b8b6 SHA512 6bab6305bd3f902309ef0427e510a8000883fb115e5ca302dcad110d3687b71778cd0da31f619b50b477d83a330aba7db608556ccda2efd6087ee99d7dea1648 WHIRLPOOL 865b870abc4d53697d41ce30057cd6716eb032ca38c786c11e6e28bfaf25ecd70cb05ac401bed66faeded62a433b919005da3e9012f1c9dc7d1459b68b78f505
 DIST 6.1.3-oasis4.0.patch.bz2 946 SHA256 12d7c5965e0c46b0f482514d9083d6be94d65eeb14ba29c17d507d5f9669f84b SHA512 7c7bf4ef90550708bf41b1831dbe71c38418b46455adb3d42ec609d287894ac9260d9671f1759f71c713ced72fa004b9808391ea6874007ac8b7d7637f349d32 WHIRLPOOL a2bc27e1e054e1717c387f3800533fa490c03d1d18d3fe3cff4676f0ec47799a1681a206e01013c1b8f8e41162303446a824b86effeef2ed73f059feb07fb820
 DIST ccp4-6.1.3-core-src.tar.gz 242134076 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324 SHA512 413eba806107ebcdbd93e9122275463709133d9b2a9ce44ae57a6c2350465a47ba66ad9875237aead74f5d422c0104f58f728ab37a757b10d82cde92af444c20 WHIRLPOOL faebf8ee7920013bc3d0e83565207dca1f31ba0b5c92fe1eae4b740f70ff2031d95787fa0d545b09c853d25657c08973527e43de02fddc086988123ca2a6339c
-EBUILD ccp4-apps-6.1.3-r11.ebuild 9982 SHA256 188340e65b4b3db2196543fc7f8cc7e3de899e4ec85cb2ffa72a1991628fe638 SHA512 2e917437b5ac5f3cb56310b63767bf58ab77dc3eeba280c4470b1f591984baadd4fb76b63f25f07ff4fb1df22bfb073adf43758bf02db5e9bf05e7557e19d6c5 WHIRLPOOL 6d861fbd1d35c42d5d3ed28128641f3cd4500b310a9347b24cf55cd7c04c708e2e681d526663afd11526e2ff73aef13487d249c826c6e7124ea1965a16b09467
-EBUILD ccp4-apps-6.1.3-r12.ebuild 10039 SHA256 fbd956878149377797dce43758494a5e7b25346576c50bb258d8579f8e05118c SHA512 50a80b7732a7e4b646e60d6cdc53683ab39099f6b908aa30891c8aede7f77b8f8397af1924c5dde570007b88a88dff658766151aa88052f9d20289ea05072e1b WHIRLPOOL afb00f618a745d46bc330a45d515191c3b72cda1299d898812da647bd9a7fb378a5aa493925db120db1e6fb27f8f15ea415390fc5471422f245bdac5eb9284ac
-MISC ChangeLog 7410 SHA256 ded879e9add83f62f0da0626ff77e6a20158e4d76ee24932d2455e940f87446d SHA512 0465c0b3e9cc8b369bbab2c0745aa6cb4370c8238147c722a4923ba48a13ffb1e25d3ff6b528985dfcd127238c071ea9fcb6dd27e684f60acb5f20a13cd8f7aa WHIRLPOOL 6d09ee15c05704a05741625de31ccf6e3c191db7cc595cc84a43c824237f2e1e3b3d433dae51423365aa3585fbb06c415567ea5064f73388cc125ce14cc93160
+EBUILD ccp4-apps-6.1.3-r11.ebuild 10004 SHA256 d6fb2e7c8a447dfcf1dbc6cad473bffc4be78ed853de48226fb04ee17d7f1ebf SHA512 e4f8ad899cfc803f704545bdd31c855ae62c4b0c4bcedea44417401573df5a5cddd455a7240f5b532a1e8b41f635f3de923eb797b49e4062fa3eba6e33af2d0f WHIRLPOOL ef291032ce7b5e2845cc3af0e7936b79006c4170b91d9237acc86b3df8801790f7e5e1e5e2845739e136bb5ea9b2847c969444f8abfc687308e2387dbb6931cf
+EBUILD ccp4-apps-6.1.3-r12.ebuild 10061 SHA256 e12243d3ad53764db1f69d65d4d058169c44a4a0063357a6b5dba004b5a3d048 SHA512 3d578a69bda6b27401809cf17ee8730993c7052572ea442cf97b8aed57533325fed9759726544957aa51edcc8a8f21b46115cd6b4a27ef3e8d973fcf619a7e00 WHIRLPOOL 365b4099e2d2f69ec8930135806b96d17ee97c70b4a09ec6e8aa96117ca381a802615fbafad3d56a777f29af1c406debd8a32608a6874be49c0223458508438f
+MISC ChangeLog 7589 SHA256 4bd861afd43789bc2cc6846f103f3b779853164ddfe15f867cd5f6bc5080b85a SHA512 385c3d9a13baf2568482a568b74085099d537f25991fcf90bf1038673cd4beeca2cb1a905f3c0db8e85287da68fdbf2eabd0ce5286747a1266220471fba44e53 WHIRLPOOL d8290fab624f321a4036aa244341e98f6396f18575492ea40a0439fbeec2278b4acd492765354e9456ce75847d9dc287a5af2a7dbfd09b914cc0c06aebba907e
 MISC metadata.xml 168 SHA256 705462092174cd3e2e3ec1557a28108a746b7351f803d8ca6d1b925b3111c3ff SHA512 f0073fb277e20adb7781aa6ea7f8237bc2d350f0aa43f0f0cca33e02cf52b8fc117bd984c11721ac519a2637ea145976148ac1aba7335dc74c42f7b9531cbed3 WHIRLPOOL 07dd7a302e695440f5033889e5b20cada57beedf17ad33f95d45fb5c39da98bf206eaff13334c20c1c08140a9c5e6041341d29c58efc5ca59b112b60e1662318
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDu+owACgkQgAnW8HDreRbVeACfRYryJ/kaJY8M3jQQq8etE7gK
-xI8An0ShSSrRKiPmSjh6c4PSI9GWhTJ6
-=i0Rs
+iEYEAREIAAYFAlEuOhAACgkQgAnW8HDreRb5YACggi0+I3wASR1r9oqG83PZt5vZ
+mY8AoJzgj/vGzCrp1ElNTscz2pNghDUf
+=bBJO
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r11.ebuild b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r11.ebuild
index df20f130c96d..b8d1dd12f76e 100644
--- a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r11.ebuild
+++ b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r11.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-chemistry/ccp4-apps/ccp4-apps-6.1.3-r11.ebuild,v 1.2 2012/10/19 09:41:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r11.ebuild,v 1.3 2013/02/27 16:53:35 jlec Exp $
 
 EAPI=3
 
@@ -98,6 +98,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	tc-export PKG_CONFIG
 	einfo "Applying upstream patches ..."
 	for patch in $(seq $PATCH_TOT); do
 		base="PATCH${patch}"
diff --git a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r12.ebuild b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r12.ebuild
index e9ddb76c4103..87d8f63f9092 100644
--- a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r12.ebuild
+++ b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r12.ebuild,v 1.1 2013/01/10 17:29:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r12.ebuild,v 1.2 2013/02/27 16:53:35 jlec Exp $
 
 EAPI=3
 
@@ -98,6 +98,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	tc-export PKG_CONFIG
 	einfo "Applying upstream patches ..."
 	for patch in $(seq $PATCH_TOT); do
 		base="PATCH${patch}"
diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-lapack.patch b/sci-chemistry/ccp4-apps/files/6.1.3-lapack.patch
index cef286b16b7c..62892db01147 100644
--- a/sci-chemistry/ccp4-apps/files/6.1.3-lapack.patch
+++ b/sci-chemistry/ccp4-apps/files/6.1.3-lapack.patch
@@ -567,10 +567,10 @@ index 833f483..bcfa62d 100755
 +  # gentoo is clever
 +  make_blas=
 +  make_lapack=
-+  BLASLIB=$(pkg-config --libs blas)
-+  LAPACKLIB=$(pkg-config --libs lapack)
++  BLASLIB=$(${PKG_CONFIG} --libs blas)
++  LAPACKLIB=$(${PKG_CONFIG} --libs lapack)
 +  XLAPACK_LIB="${BLASLIB} ${LAPACKLIB}"
-+  XFFLAGS_LAPACK="$(pkg-config --cflags lapack blas)"
++  XFFLAGS_LAPACK="$(${PKG_CONFIG} --cflags lapack blas)"
    # Otherwise force building of NetLib BLAS and LAPACK libs
 -  else
 -    echo