sci-libs/arpack: Fix arpack.pc to use the correct lapack/blas libs, #491114

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 42 insertions, 17 deletions

diff --git a/sci-libs/arpack/ChangeLog b/sci-libs/arpack/ChangeLog
index b20f4d4398f2..14c4780c0eec 100644
--- a/sci-libs/arpack/ChangeLog
+++ b/sci-libs/arpack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/arpack
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/ChangeLog,v 1.53 2013/10/13 17:14:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/ChangeLog,v 1.54 2013/11/13 08:20:30 jlec Exp $
+
+*arpack-3.1.3-r1 (13 Nov 2013)
+
+  13 Nov 2013; Justin Lecher <jlec@gentoo.org> -arpack-3.1.3.ebuild,
+  +arpack-3.1.3-r1.ebuild, +files/arpack-3.1.3-pkgconfig.patch:
+  Fix arpack.pc to use the correct lapack/blas libs, #491114
 
 *arpack-3.1.3 (13 Oct 2013)
 
diff --git a/sci-libs/arpack/Manifest b/sci-libs/arpack/Manifest
index f1d668dfeee8..e54abe85097a 100644
--- a/sci-libs/arpack/Manifest
+++ b/sci-libs/arpack/Manifest
@@ -3,6 +3,7 @@ Hash: SHA512
 
 AUX arpack-3.1.2-pkg-config.patch 1278 SHA256 635565836cc2156eb577ba67f4910fb95a5c2b7fa0d7fbab2ef849bdff2d300a SHA512 c8ee73c3d5c2033604f128b836c50a09266b12e57150ff321f4c0c6a796dc4aa24662982020f69594d70b7a895b5c83fe8dc9494f712c37b6395fb3d81b809f9 WHIRLPOOL 933dcb3bf202fa0c43e868dc6a159398e32eabb395564409115c19d8c6dc33cdf6c83c10d7c0645f8d909b317026118e05b09f95f047d69fbc8fdfe6f4886a94
 AUX arpack-3.1.2-test.patch 1490 SHA256 dccf95c6e3cccad20fdba2cbc68e15236a7889ceaeb3a5218533cf14005450ee SHA512 9e5f122acb743a7f7247b002b5951478d4a036d6ebcf9546552829bfa89343bbbc2609b47c3caa6de80a18413bd1d107bc7928141b5b3baa43f3da6c4b08621d WHIRLPOOL 6cbdd144c702f5f9a5ba2b78043c20a3965a58cf5b3db5b49ae7f967a9fc54a7e50155b8061e2c1fcf99ecc1679ac9a93cf5dfc5293ccf2364b684d201f000e3
+AUX arpack-3.1.3-pkgconfig.patch 375 SHA256 f4639122a5ea39f99fd2f7bfbeb0c52b9ec5c0b79a4f40b3753094a120aab93b SHA512 77f91df2a612b6bc3ff8411a42f0d2cfc416ae41f4e5656c424515621c40858119fd39fa20db845a916629e6d1a9691c05243263e57f430ec902f42376571cbc WHIRLPOOL faa88aba7894ca15fc7bf2146f377bbc50e4b454441f66f8f0833932cd64183c53651257af988f0b91db544a23cc4b7ec69061851d1cb69eb0c6ef91f892d402
 DIST arpack-96-patches-2.tar.bz2 504621 SHA256 ecb2aa94feff0ff6d9df3416c205d3c3715073e6abaa58dc3a39786ca7e686fc SHA512 5f661198730fb5dd5d79d02d01cef9abb09f4b3f3bf29586ff65cfbb7d257f99ae4386381ecc2bafba25e59d9fc4a0d1ab1adbce103434ff94e5694333ee15da WHIRLPOOL fc62cc4eb78647ff0b45ff4a10599ca54036c0c60f45840a48a5009b36754e60ee0eb8bbf87fe8c8c854c8b0db8ca6ce023649cbd5b33b4c8569f48d3dc180fb
 DIST arpack-ng-3.1.3.tar.gz 1299344 SHA256 4d649b80778e9145b9220f6cdd0d96f589f4c4fb225d385419be87dc863c3c0d SHA512 30bee66edc31d1144d029a4c6c4b03f08782bdcbe1b9627e0c3df8d142121111e9c9dd875158345918931815341a2338cd889a010939016509a7cfdd1e829426 WHIRLPOOL a804e3d85633b39fcd66f853a655a8d2c76daf52f23c0aa5b21b6af16b08f37e6fa0ec30700e6df3f4e52fa55133fcc046595a2ee836f5750edb0aa56840c169
 DIST arpack-ng_3.1.2.tar.gz 1299556 SHA256 9338bda5bef5a4bafd99c18f327acb54f8be4ffc5c53d0a186e4aa27db3260f2 SHA512 ddf07c83a4b5230822c6ed709d9a18cd01fef78826602d4876fa7dc3e6c4b90e3581519eb50601b8c62023db7610a92ef5dd568c385fde4942cfe0a501e4cc9c WHIRLPOOL 29614e2f0b6b5fea87aa655c217c4f46f32b83f0b4286c7f07395f8d97c6fc7a391c2476cbd269a6236a4ea39f4a9aa9dde2a76cce115ae30ea01bad7a659df7
@@ -13,23 +14,23 @@ DIST ug.ps.gz 248543 SHA256 ff1faac74bfc42442955906132756ecd7f0034803898d507dbd1
 EBUILD arpack-0.96-r3.ebuild 3247 SHA256 b1ca77d609e1ca843137b122143e4158b7369cdf231d25e2a537fa1a394685d6 SHA512 83b19de4f95d6ee4d930e86944a312b1767620fdd3f7cd7378a446520cbcb9aaee401a4292e2aa6670bd7c6d9f0aee79af57a2766063a5aafb54104bfecdcf22 WHIRLPOOL 3105eefb4529111ac64890f04b65655a0192125f07486052e1e58918102f5deb68793069d9d44bea5c9634275704863ec6f65f1cd0e797e5792a5389db5da92f
 EBUILD arpack-3.1.2-r1.ebuild 2393 SHA256 d519f1f72c7a9c13be0df7642a9d60eaf35f1182f793df5eb2a8e3997eba0478 SHA512 00c7265d05d47fbaa1b0682d89df63d7b8fe1d2f21f46b14684faec2d68822c8897b0444cce7ceb45c6ea390b0e209103db7532aa983b0330cfe00b62cd41e53 WHIRLPOOL feae7f4370496894a995fbd566495192dc05231dee618c699560ac046dfd88d37484311669ee4974ad8a1b98a62f00f753f4a4078d3e1ca4252c85e8361d0cf2
 EBUILD arpack-3.1.2.ebuild 2299 SHA256 709bf30014ebd7b868998e710164cffab14817dcf5c5ebf3c3c2c699e4dcd1ae SHA512 92b989ae0202b435c8666086c46d7d27a38c8f8f4a0a8922b3245a0e800594944cc99bc131bf6c2e3ee62a0bd5595662b40d42b27541d7e23cb75f6ed55c45f3 WHIRLPOOL b8a28e5afd70dbefc2db0ac264538231d93059031bb2c3016bc434438619391a5f964fa7426353f2ebd248e77a3569b41f05ed4f51c60f3e402ae39d8fd1614c
-EBUILD arpack-3.1.3.ebuild 1574 SHA256 ead6d4860d70c142c6060376067e06867ef638f8bc2ccc848c025033f69d82c8 SHA512 c8d0ab80b8a62c0d08bd22b6af25eefed6464c69c671be783fadd080d48f157648d625b3f19f8d5fd5a69bd2c349dfb4fac5319eb3326e9cd059e75ac73db899 WHIRLPOOL ae39f6dadc0b20c2447e30be21d98da21c271c6d7c8b6e50f7ac31b67521537a3a0acef776f56d72eeb62f57c5993121c611a144cf400816b9ae56debf1123b6
-MISC ChangeLog 8249 SHA256 21a9857a3ecc880d3d401dbafea611049b56e531a8ba838cd1f1785f2aaec612 SHA512 791a377d57ecd45e85d362b2dab2bb01f82cf9dc2f83d9d0a3747a2c38c34347e67e9bc7ffd43758a2fda42d5a65a4bfc16e6b3eaf623b83dcf7b89f5a016365 WHIRLPOOL 00e98b027fcffe4c2eb33154d071c6610c66d491c0404104aec2e907f2ada74a9ef63532f0270cc711fa47d4912ed658271a72a107baa716d5967c73b996700a
+EBUILD arpack-3.1.3-r1.ebuild 1626 SHA256 e23744035d716c337c1ee9610386443d0bb6f403747a7bda8aacff8a199eed7c SHA512 ee5b21124fa9096ab47053bd07d633768e1f098275569def33728d5906894197cab9216414887cb131306da09a416a10eff8ae2a1fd2a01cdcd75a3587c877de WHIRLPOOL 99234dede6389c0196c2cefbb27303d2f6e419eaf45d48203c4071c71b9f07be1f7eef77406cc212dbb3a1750931972bcb3a8f5b832531619aef8358f8a7a666
+MISC ChangeLog 8476 SHA256 5866bf3f79a81be669c6ad2939a8a08a9ba0a509bd6f2643adf7c49de981f5b5 SHA512 fcfa5f74a9743a16b40e08475759b9094b2d39cc607249b1a83a978f7af5f787d3b46c10aa18d3f9a72aa7e6987bd3f77fd3fb59cab8e4c8b413eeb108519133 WHIRLPOOL 6db395e67641a3b206a886da98b9e576e253ff4e83de42c077601a75b77fae5608aa5d730c751b269e7e202070267e206d4ccc6a0985115f20122ff202bdba91
 MISC metadata.xml 782 SHA256 82dcbb6ce1c31fb43d82504472ad58c6bac49940c37a1595cc277ae5e7a98b6c SHA512 69dee866acdbd5075d38e4494622ec2bf3e934e48683aa5bfe6183bb89f18b19777132644fe1970f877ffa71e931cb0cd966ed52140826db2d83cbfb9eb22802 WHIRLPOOL 46fcc15dcabc5c9950ef31f485ac6b4d75bc581ebd87bf04c1ebf5f608c23ccfc846e45ac10863fcddb7c028b34776cd8c4514f308dca408ab2806b004c71763
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSWtTpAAoJELnU8jG9FVirKxQQAJCPXaBCPJXvjAazDzHWWXdj
-I6H5YhNVKRVRZk4LgjL55NomGnnhHRZKqkWP/G0o5EirJcWtuo0yPzms3Zeh5hB/
-vtGB8SOBI5avHMzR/OxT22rBL3apkIHrDrN8nc18xhCSVRFsXvXdI9SBjfWg7wTl
-mwk3JiUr3e/xGrjB+Q+HMJ//PN+6M2jqOSA3+vZGOK7RKMceMcNrvW5lQZ7SzCTk
-QSk1gETZ6PQBDUradBSY3ubCdTQcRyDI1z6KHBeC66Hri9TIRtwkUFkJc3WJWVHn
-to8cm2luh7uNUjHTZKD9XWviRGv56a8SHg8nzwrOtwhpN6L+7++nG6X2D90PCrzV
-g5/fwKqaVQ9qtHAqfN5IBFH1zLSNZmn+5Wg1uy2KdQxGxSSX3L6SYCCJ68KyL8m0
-MAszoysK8AiMVKLE3BXEZh+GAOxbtmWCPIUCOnaHtOIpodqrvM/+PetUvnIDR4M7
-RwiwD166xtyItWFJowAPWcU8lkj0kAzpIDE2yvJYIGhNK65qwvk29ALSwLwSRHK5
-tKunWFtq0WNu6RfuZLjYQdeeGzDqDZIJd6hqpUR7Pg9HhU4fnbJx31Z84PWAZUmM
-no3yZi47gXQpVdNLBC3eei/itE9wuSc2tcdpWNq8zZYjJWdao0aVOUWK9dPyPGzz
-FsQrwRWVIM2HXw3CZTi+
-=ddNU
+iQIcBAEBCgAGBQJSgzZQAAoJELnU8jG9FVirISoP/2hbU/S5P/ptsBtLiq7HL/t6
+tfaZAe9yRgGVSAB4x7beIKqKrg2HrGTuzXJDXCRf670mkRQqQCaB5mEQaFN9piVJ
+q/y+Cy+vH1zjepPIJKqmauykrrQGyAa3mHNLDWPDKgYSP88H0XBBlu5Eo7GZXhbz
+58mJzUQmeTlkLwM6VaXlNRanm6CNXLtTR35yw4dQC59EdHrXu+2ylUa3TdKjQ1Z7
+Fz5fBT4jgl8H5Xaeh5kvQ1FIuGhzidOLlBbGsUYn6TEAzkuB9S6tpr4jgNaKANLE
+eDs26Rd2GrjHtc8ag4fERoTbhIyXE6Yvu0JywzfOCCGmGXII5bhy45wSY4CnaUIT
+bLhXLqetFQR2MV1OJsV4YzeJPnJh3VovFSsEPfTI7tGTc22LVVH5aLoTkb9nunK/
+2OM9SzeE9U5IwHzZgn4vP1d+9aLDFPk7LiYNV0wHMi57F3AOuHDMktHtzPFlfSla
+PpGSbnKlQKT7+hFwPZt/wnqY5fhjpYSjr/blNphvsTj0V+gU1SwfjXoQ+15yHQI3
+YTIUGFGAiamG7RJarCWmzCC5Dwe3eIB+7rvg92TwOixGFrlIbbL/2ie/1yvbC8Ge
+pa21FxAfbdBDl1WV8FZUYt/xJqv7EWsPnrDl7B6m2/cn0NBAIljSKSqOmbmZAatm
+vlQND+n6AF2HVdlIQMOf
+=3AYB
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/arpack/arpack-3.1.3.ebuild b/sci-libs/arpack/arpack-3.1.3-r1.ebuild
index 86686d8ed362..e4249d0c29d1 100644
--- a/sci-libs/arpack/arpack-3.1.3.ebuild
+++ b/sci-libs/arpack/arpack-3.1.3-r1.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-libs/arpack/arpack-3.1.3.ebuild,v 1.1 2013/10/13 17:14:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-3.1.3-r1.ebuild,v 1.1 2013/11/13 08:20:30 jlec Exp $
 
 EAPI=5
 
@@ -32,6 +32,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-pkgconfig.patch
+)
+
 src_configure() {
 	tc-export PKG_CONFIG
 	local myeconfargs=(
diff --git a/sci-libs/arpack/files/arpack-3.1.3-pkgconfig.patch b/sci-libs/arpack/files/arpack-3.1.3-pkgconfig.patch
new file mode 100644
index 000000000000..9afe5de6f6ca
--- /dev/null
+++ b/sci-libs/arpack/files/arpack-3.1.3-pkgconfig.patch
@@ -0,0 +1,14 @@
+ arpack.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arpack.pc.in b/arpack.pc.in
+index 83739bd..996275e 100644
+--- a/arpack.pc.in
++++ b/arpack.pc.in
+@@ -5,5 +5,5 @@ libdir=@libdir@
+ Name: arpack
+ Description: ARPACK-NG 
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -larpack -lblas -latlas
++Libs: -L${libdir} @LAPACK_LIBS@ @BLAS_LIBS@
+ Cflags: