bug 505904 by Robert McGehee: revert the blas library configure update for bug 499356. I missunderstood the purpose of this option.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

4 files changed, 12 insertions, 18 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 0a763574f0c4..857c1ad81ab1 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.233 2014/03/19 16:41:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.234 2014/04/07 11:58:36 heroxbd Exp $
+
+  07 Apr 2014; Benda Xu <heroxbd@gentoo.org> R-3.0.2.ebuild, R-3.0.3.ebuild:
+  bug 505904 by Robert McGehee: revert the blas library configure update for bug
+  499356. I missunderstood the purpose of this option.
 
   19 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org> R-3.0.3.ebuild:
   Re-added the autoconf since we modify the configure.ac
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index d7d14769fc20..9058d1645a2f 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX R-2.11.1-parallel.patch 685 SHA256 5e57374318a3f549fa64c939a45964b941fac1f9b021cdc94ff1d40ff23032c5 SHA512 30491365eee00389f6f09c2093b5b5a568f4567c110cc0cb3332a53d6a7fcd87fe8f46f9f8521cf21bf1f0cfa24f4282a6e22396902f454c43f26542ac22c2a9 WHIRLPOOL 266115362f92a57d7a22d7b8810d12641e44c61b8396a8fd1a7fde2f5655a4990950366fc801d1d621e045a5a0b44d34c982cddb11396e82c019bec386a65f2a
 AUX R-2.12.1-ldflags.patch 639 SHA256 dee11fd510d31add8166230a7af61b7e700f2f4f122cbe0a07310d0017874933 SHA512 49b73cff79c1521e214f036390f32eed8c7d4afd39082eabb7e6c59e5d7136f399ff7227117e418d4445647d25259dce8eb208a1ebe5990bf4ad87cefa250338 WHIRLPOOL 98ec264ac6d68e64dcbce32f4688aa458ba6d300202b6f31cd7580de68c693f0fb6aecba40cd0f6736a0ef9ff346d04cd96af06716a25c4a84a72551085837ed
 AUX R-2.13.1-zlib_header_fix.patch 591 SHA256 e185a2c324796c11cca171da63663a59e45b558e13f01af8c9527bd09ea1028b SHA512 1ada5a3ccb0ff902f7df35d6a42f4e99fee6a1f7b36ece000b9e2fed2b731abf5c3687d22239cd324ff6677bf8edff3415aca57c31beef33c73b98073206136a WHIRLPOOL 989418f4fdd120ca0b163b61e7e0bf56e7b52477b38b310ef281c4637c979b5b483d8b955a0167c719ca96e276798ea647d647080164b13e69d3789410d5d813
@@ -12,14 +9,7 @@ DIST R-3.0.2.tar.gz 25364181 SHA256 956e05ad60447955049285420b5a48e0526aa4db676f
 DIST R-3.0.3.tar.gz 28075821 SHA256 b97cfd9540f294ab786e846153f3dd8605610d7e27616bfb4296795bc4fde6d6 SHA512 881c9c0a8d866eb87218a5cdca72153c9ef0fa0a0f091595fc065bdcbc1ea8b0bd1a2fb3008457b12e1b5025a7e70bd7764de4286a57ad3f73226367b2fc4e83 WHIRLPOOL 076d041c0581dc211a4ee53cf5cad731dc0ece33bbb34f8c066dc660ef0c1f7dcfc1b3359c6a0cebfa2ccec9b689776965a530edcf9f81758c4e003242347225
 EBUILD R-3.0.1-r1.ebuild 6665 SHA256 33a5272b70e441719d8f36760542f182d245955e5e4c4f24f6359f3a0ba198c6 SHA512 b34927327b9c101ac63154fbee6b277f798656f73f7abe1580a9a4b7a7ab32b1f19f92a229dd590db4ef374def4a0bf892fd7e342ba058eb516f48b981d5d3dd WHIRLPOOL 305c56f51d75c0f5e85c193b8af97193f64d30be83743dd98abbd580e00efae502ac1a068df94758f0b68abff586204b4f10c84830ab4ce34fd28fad123b5d5d
 EBUILD R-3.0.1.ebuild 6164 SHA256 07cc4f9cecdcd84bd812872e2f2d6226b3ea900789e9d36584d2dbc5bbb01fe2 SHA512 c6ebf91c0538ce73a8641c122371d51ee5dd42c21ab7ad4ea59aac48fb969a793e70a8d2bcd2834a7f85a48fdb725ed0a4bae51f772eb6053dcadb0e8c9d31aa WHIRLPOOL 9d409959f871ae9733e010428523f4cfd77248e67e71e99cd4c3c918a1eef6d3034432662e4c791fabe8409eb8a8a50c3194a5d51f0752d6fa7c6ea8e51976ca
-EBUILD R-3.0.2.ebuild 6425 SHA256 eda91b076224d1c30515eda9f18a751e343e4423fc16dcd98f4c6fd8f2b64d66 SHA512 bdc8ca0c1de718a1e0a8d4531c9f8afa4a6d9ebf30c736e4d8c2141f650f5c8202c694ea02b35c56f977fcd0292b9d32839508c8bc906dc49d1d69567e1ae869 WHIRLPOOL 5ae0648a59c09801a941763a823c0c4a429c12e2d653a39ddb0a8c3fe73adfa74db6ead973ed1fb17999de1752157e7d5d7b62c46463b44ee761534a83461652
-EBUILD R-3.0.3.ebuild 6155 SHA256 647bf0eb548e0794a7c7641ac7d17b7227a6b30bdcf7bc6570f9ec4d21ddb0bf SHA512 a937c49353f8427ccafb854c17c0ac36e4a71853c28332eb7fc844d5b24cd93cfdde92ee50d924120117ed092e35d2c3d961d241e8be7f44ee7b1c18d0dfbab1 WHIRLPOOL 742e9aaf1a6a19908d98f7c049ff834e2d33b59384f36053d73d9e4c744add6925bbe70816a6bdfbae9f070a879419d9e51a7a34753d9db4306729dbef2854f0
-MISC ChangeLog 35518 SHA256 4094c4edbcea2fe29b796e5a4d2b2722e85c58b915aee7234c1e444812792312 SHA512 9f843a4ba9d9b68f714340cdc7391c38accb8848dd190b02c408a25050c1334e314c60474079881904183c903af9fd8ebc9beaccaaf907dd69214b2ede4d8625 WHIRLPOOL df7e26344e2990194aac33cf97f43617ed8c38aac114806087639aeea213cd4269263f7d6c6c57b673b37a58185e72a81e00dabe37715e45dc1d3e866aa33903
+EBUILD R-3.0.2.ebuild 6412 SHA256 4e80b4572119dbc2ab95071e2ed49417b8e714d0c96acca4d545a25d2d6274da SHA512 f862ec0cc07ece07f1d4f9605a2ca9984a18f3c3d5b8a8540481e391905367bd7795c37e7d20911fd4eae383e6eeea80318c45f1e1fc5afb56270408c302f2f2 WHIRLPOOL 558f3838bf4a68c6360374b63b983e137c4c301571ee5bbcf5911b6bcff00e5889c50eacc69857a70a9f050e3a1f4ebf377cc16d66b618803a87bcb6714308f0
+EBUILD R-3.0.3.ebuild 6143 SHA256 19ef8fdbc1fd63df4cbc7be92e1d9068cc3f4190dc7e5cde4c3446038246bdc7 SHA512 c992ab0f78e07e937fe6bdf8ffc8580b4ce6286282672fa34810c00a8c06a53307f6ca99da51d644221247525d331091b4f5387cd2d95bac941780871449cc66 WHIRLPOOL 6322a15f9d1c877b8d0a6bb974abd3cccb753055aa62f1b91d62790055f2e2cafa1a4929dac15709df1029b117d3e7c11c2295f99c9c87fb4151eabb8fd90f02
+MISC ChangeLog 35731 SHA256 c8001dfc1e427270230c68a9452f583dde4fd162e4766b8b5c99facc4787a6e3 SHA512 c7f836c59f70dd0a37c0f9c4e5e4ad083a031958f6ea7927ea346c252ef0360f4eda7fab84e85483a3500d7886036abdfcb4f5621afce2e1fe55c861b8c2c0cd WHIRLPOOL fbd050d1d2eb6790e6887f744906440095e7e29dc7b0969594e770724c55f8111a5e53179edab4ccff5d0b2b4fcf739bd6c9459fa6dbb84d978e27fac5dc36ec
 MISC metadata.xml 1136 SHA256 7d7c013a77ad6ffc785202e05711d4127a77f64fe09ef919deffa80cc74f992a SHA512 761c3afcbfc76c6026cc6a6f89dae2502f495008851dcb070ee04990653ed6785f089d31a0ea3ada11ccf3d027d372256d04a0baf9ee5d2528e63a9ea4dee313 WHIRLPOOL b7bd0d3843543ff07d15e2d18ae56358477667cec9e78be266f2d983304537afd6c1bac0842e403ce62729248debe2fddfe345c66e022bf2716a47d7819fe041
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlMpyM0ACgkQ1ycZbhPLE2AgmwCggaayCem2RdMc4hdXoGw0c7Uo
-/4gAn3i+0TfbmE60ktk1Fi33G3O9zMKj
-=vi1u
------END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-3.0.2.ebuild b/dev-lang/R/R-3.0.2.ebuild
index 0cf3d61f74c0..e2027d16e9a2 100644
--- a/dev-lang/R/R-3.0.2.ebuild
+++ b/dev-lang/R/R-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-3.0.2.ebuild,v 1.5 2014/03/02 21:33:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-3.0.2.ebuild,v 1.6 2014/04/07 11:58:36 heroxbd Exp $
 
 EAPI=5
 
@@ -139,7 +139,7 @@ src_configure() {
 		--with-system-bzlib \
 		--with-system-pcre \
 		--with-system-xz \
-		--with-blas="$($(tc-getPKG_CONFIG) --variable=libdir blas)" \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable nls) \
diff --git a/dev-lang/R/R-3.0.3.ebuild b/dev-lang/R/R-3.0.3.ebuild
index 73dfb5aca541..8a1e0aca1159 100644
--- a/dev-lang/R/R-3.0.3.ebuild
+++ b/dev-lang/R/R-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-3.0.3.ebuild,v 1.2 2014/03/19 16:41:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-3.0.3.ebuild,v 1.3 2014/04/07 11:58:36 heroxbd Exp $
 
 EAPI=5
 
@@ -133,7 +133,7 @@ src_configure() {
 		--with-system-bzlib \
 		--with-system-pcre \
 		--with-system-xz \
-		--with-blas="$($(tc-getPKG_CONFIG) --variable=libdir blas)" \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable nls) \