Fix hang from KDE bug 274940; find blas with PkgConfig

(Portage version: 2.1.10.3/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

5 files changed, 123 insertions, 14 deletions

diff --git a/sci-libs/clapack/ChangeLog b/sci-libs/clapack/ChangeLog
index 8d63ba8..d5787b8 100644
--- a/sci-libs/clapack/ChangeLog
+++ b/sci-libs/clapack/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/ChangeLog,v 1.9 2010/09/18 22:44:41 dilfridge Exp $
 
+*clapack-3.2.1-r6 (19 Jun 2011)
+
+  19 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +clapack-3.2.1-r6.ebuild, +files/clapack-3.2.1-findblas-r6.patch,
+  +files/clapack-3.2.1-hang.patch:
+  Fix hang from KDE bug 274940; find blas with PkgConfig
+
 *clapack-3.2.1-r5 (17 Jun 2011)
 
   17 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
diff --git a/sci-libs/clapack/Manifest b/sci-libs/clapack/Manifest
index d1f8c72..ad3d246 100644
--- a/sci-libs/clapack/Manifest
+++ b/sci-libs/clapack/Manifest
@@ -2,8 +2,10 @@
 Hash: SHA512
 
 AUX 3.2.1-solib.patch 844 RMD160 a756639bdf6acdb0f017de592efec88798769155 SHA1 a04f2a910b633f2a5b4e9d1728670486ae8df504 SHA256 da2d1befec291f905c03bd6d73f74f361130ef22ad2629aa5edec8ee5e0d5b53
+AUX clapack-3.2.1-findblas-r6.patch 2001 RMD160 ae087273de037f12e96067c54eca15027ac3c225 SHA1 5e1028c1f561d1cfaf43c5a34bf9bb5d23c90cf5 SHA256 1f9c53147fd0e0ba3e0b391fc37a814d1d0b5cdd66327ab05b3f9746d54153e8
 AUX clapack-3.2.1-findblas.patch 1945 RMD160 97595331812bbdbc5c63c7697dd00ceb7137e9e7 SHA1 3aea0b50f353d47f999f591a26480f813ae5966b SHA256 c11045e539ff7c19e12e590cf1d55518b9c53250adb65d0bd5a77e7a9558bc50
 AUX clapack-3.2.1-fix_include_file.patch 689 RMD160 1140593aa3d24e749e86b2c15f01b59512287c02 SHA1 eec4b685ab1b09333e7d5cb5d2d1419815935b9f SHA256 9b6024cecbfb152d910b8fb878db6918704388479876719b43f4378992581603
+AUX clapack-3.2.1-hang.patch 673 RMD160 60927477fba0840fd9b7fac205e600d9564c659b SHA1 6d09117be6b2e5e112efc320add1294455e9dec1 SHA256 41271247f5e513e571f3f4459f41ef9782366c60d1aee9097b66f9b075b054cb
 AUX clapack-3.2.1-noblasf2c-r4.patch 5852 RMD160 7dea18e7fd5bf378ba9f6495e457c931b8ee7bd6 SHA1 1bbc3178c09832d4654d8d854a4156bf61c81112 SHA256 39c6ed8e878b0fe74c1eba9745d60ea35611596b4ab68191e42fe3dc0f7a14a3
 AUX clapack-3.2.1-noblasf2c.patch 5841 RMD160 50ca84aad167c389ddd5fe9c760daa5fce6a5082 SHA1 f14ced41155786b90ea8b98f9ab746dc81e8719e SHA256 37525a9099aba9130346abd2b765d05b7164c880a45b0b231b9bedfd63894fc2
 DIST clapack-3.2.1-CMAKE.tgz 6017667 RMD160 42af2b40a78b0cc4020a961a2fe0faf73c20560c SHA1 5ea1bcc4314e392bca8b9e5f61d44355cf9f4cc1 SHA256 0b3f782bc24845d85f36bafbff0f2f1384dc72df730fda4e7924ec1a70baca5a
@@ -12,22 +14,23 @@ EBUILD clapack-3.2.1-r2.ebuild 1544 RMD160 3e61910680dbb57e316705330e796fd1ed456
 EBUILD clapack-3.2.1-r3.ebuild 770 RMD160 72d2e792b30db7b8820095d88f9f8f6aa776393f SHA1 269f169309a273228d948fc10e20400616e5e326 SHA256 667d88d56748e8c7635e37ed8c2f4e3feba2ae25f2921a61cd9599ae098de265
 EBUILD clapack-3.2.1-r4.ebuild 755 RMD160 aa477556ddafb6818a8e96cac3e16b2102f6645c SHA1 cfea68d6adc9024d1a0652b54224dc51ce870188 SHA256 1ac568e45d6d2327ae34f0d577a8676092f39da2d146dcfd3983e8325f34f3c0
 EBUILD clapack-3.2.1-r5.ebuild 792 RMD160 dc6fbe4a87dffc3b6cc1083f2153f95f613de52a SHA1 2cf698bbf7a9e83d65da0d6834b39436d0425838 SHA256 bdf016d23e341ffe5b9631071c8006c5c8022c05a4eef0ced7d3a9c46f9a12d1
-MISC ChangeLog 2454 RMD160 9da15fc858e72c7ac0608fe76c6cff20664434d1 SHA1 6ad9700b14fa0733f692ce7cc2c846327591611f SHA256 818ba6712d7a0ce33b5d37f7092077734952e553ea5cf51cc87718052ea9c0a5
+EBUILD clapack-3.2.1-r6.ebuild 836 RMD160 8c22bbcfa67588618fa7bfd54e0d08653f8cb3d8 SHA1 89befcb30147ad1d32019926ed9ac28cfe55a522 SHA256 746ac07309ddab7594875f183f2d4f7f1a06290c98f1fc45c8574c08d725485d
+MISC ChangeLog 2705 RMD160 a3c2aa3aaa7493e52e9bf0d3e25fc401d223eba1 SHA1 2f40b50357fc34a2236b7dc7040a9be960dbbfaa SHA256 89e434e7aa1123faacb38777c89fc835cff5301379ca27cf89368c19b54722d8
 MISC metadata.xml 581 RMD160 aa5fd2f24c925ba53410c2a6b2b9e357a79a5e22 SHA1 6d88ecc9bfaa1d1711cfb76d307b41b0ccd5f429 SHA256 c7fdad96aad5a3bbb64f5ea60fbacfa7cf51175b32a3c8c187df749a6206e393
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN+8OpAAoJENwGBM22xffetdUP/0z2AtjP9deRgZqLu8ROeFsH
-PGMtWt7yXugYpYtoTxWDZ6PEpl1V4WVPQZCQxLN/LfRItF8U6qqTHkxxtSQ3lebu
-Id1Q3YHFBpG/CBGEYpqcmVJBgxDiy/l/yPacABz7bsiFGt6b11yn7WnFyLhPCSYE
-0HwkbPLDi+lo0axPtEw0KmOt2CdCeWmRXiapsFmWBrPfU6edqt4TFLyiLuIKE1E8
-bgQJT9V+kUK8N+KNbUn7vUaR5pa6BkGlOj7VNpRgqHHg8VbnLbrrtA1MXi6kO0MX
-TgI3w2nao+wFzf9bI8F//ZtChmCRTBr9Ln9sYxDW3/eRxe0zkQVx0YYWiVaU48+Y
-lvkk0o7CLqg1bhFyukPXzurFS8ScKSiBeVH/Uemc7fzHrJwtBNl3i5o/xPJcDPcI
-kMh0qYNnS4iaeBdViniSw6JW0Ia6XFSp5yAfQtf55R9QvU2EMEm/j6XAd7mGsbZu
-WnPtRb8ClS6Rlg0s4D+PVVP+PpMAC9VCNQko92TrMRpzEgH9aewM9vuG8b8nNbSk
-/Zjyd45405XPepH8W5n2knJyqDc2ZOC1pr4oZULCBx5J/YgBxOqO5r5AP7FCB9Kf
-OE+LD64fk+Kwh3Ob3BNtj4FNv8IuekOEP7iddm3ZrhZ3KFIisAh47Tyg/WAkcciD
-OHOsX/6TiwLCoL701IZw
-=ioBT
+iQIcBAEBCgAGBQJN/lyzAAoJENwGBM22xffep14P/iB1CZarU5De3X2ymiTl2z9h
+2iqxwX5MHzquket+WgpXoRilXn3y5Ox6IA24DxIm0mdZhmkTGrMI6ePaoC4XB7W1
+sv6V5YzBzbgrmkjEnhgCocY9y0VWFieWgECSWp/Zy/ywnBA/hHy0CsGpy0PhrJ/c
+4vP1mvIe7djO/YCevM2j03Qsqf30SrOAV2/CBFbYs17dYtCwEGRYet8eO2kLSmh3
+MasSAu8VrlDBJNh0k0AnFKF0V4Hdr1hpD9s6PcmU7A8U7AZtuoRqcTgEjHwyJezV
+J3Mk65ROf9aCMKvzZ6IcBIGhD+U/HxWlBq/VWW7zREkI2+bE6bbNstnvWy7sqM/L
+gY3Z5rMPHkzcOrch/PGMQlHOresTUyzhCa5ypFOccY31pju5yLdEkS65oBfdVJok
+VVUF7Q+/X4kse58pCMC49BhXqCmFsGJo7n+ngcebPdJChrmgeFG49MKF2yy16kNp
+q59rYFv6v0x090d2krvKzOiw6T06zIGOW4WfU6TMdefPkeaCzR6V/GqmSdyxEAG7
+FCIiZeIS9lrCrc96hXHoe91D4hUXcc8HZ7z/cGkh6YrnQOydLNgW5zfQmzwuPrVb
+MTGNX5FNACBR9zi2Lh4duGSDmfOsrUWgmVSmlCOm80y5GFJgLzlTY2jdMspPejOf
+86jAbPuJ43L3Ws50aQvq
+=+Fq/
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/clapack/clapack-3.2.1-r6.ebuild b/sci-libs/clapack/clapack-3.2.1-r6.ebuild
new file mode 100644
index 0000000..b3c03ea
--- /dev/null
+++ b/sci-libs/clapack/clapack-3.2.1-r6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/clapack-3.2.1-r4.ebuild,v 1.3 2011/05/09 23:11:47 hwoarang Exp $
+
+EAPI=4
+
+inherit base cmake-utils
+
+DESCRIPTION="f2c'ed version of LAPACK"
+HOMEPAGE="http://www.netlib.org/clapack/"
+SRC_URI="http://www.netlib.org/${PN}/${P}-CMAKE.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-libs/libf2c-20090407-r1
+	virtual/blas"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}-CMAKE
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix_include_file.patch"
+	"${FILESDIR}/${P}-noblasf2c.patch"
+	"${FILESDIR}/${P}-hang.patch"
+	"${FILESDIR}/${P}-findblas-r6.patch"
+)
+
+src_configure() {
+	local mycmakeargs=( $(cmake-utils_use_enable test TESTS) )
+	VERBOSE=1 cmake-utils_src_configure
+}
diff --git a/sci-libs/clapack/files/clapack-3.2.1-findblas-r6.patch b/sci-libs/clapack/files/clapack-3.2.1-findblas-r6.patch
new file mode 100644
index 0000000..028dec6
--- /dev/null
+++ b/sci-libs/clapack/files/clapack-3.2.1-findblas-r6.patch
@@ -0,0 +1,50 @@
+diff -ruN clapack-3.2.1-CMAKE.1.allexfb/CMakeLists.txt clapack-3.2.1-CMAKE/CMakeLists.txt
+--- clapack-3.2.1-CMAKE.1.allexfb/CMakeLists.txt	2011-06-19 22:13:27.000000000 +0200
++++ clapack-3.2.1-CMAKE/CMakeLists.txt	2011-06-19 22:23:14.000000000 +0200
+@@ -30,6 +30,29 @@
+ 
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+ 
++if(BLAS_LIBRARIES)
++  include(CheckFortranFunctionExists)
++  set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES})
++  CHECK_FORTRAN_FUNCTION_EXISTS("dgemm" BLAS_FOUND)
++  unset( CMAKE_REQUIRED_LIBRARIES )
++  if(BLAS_FOUND)
++    message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.")
++  else(BLAS_FOUND)
++    message(ERROR "--> BLAS supplied by user is not WORKING, CANNOT USE ${BLAS_LIBRARIES}.")
++    message(ERROR "-->     Will use REFERENCE BLAS (by default)")
++    message(ERROR "-->     Or Correct your BLAS_LIBRARIES entry ")
++    message(ERROR "-->     Or Consider checking USE_OPTIMIZED_BLAS")
++  endif(BLAS_FOUND)
++else(BLAS_LIBRARIES)
++   # User did not provide a BLAS Library
++   find_package(PkgConfig)
++   pkg_check_modules(BLAS blas)
++endif (BLAS_LIBRARIES)
++
++if(NOT BLAS_FOUND)
++    message(FATAL_ERROR "--> BLAS libraries needed but not found.")
++endif(NOT BLAS_FOUND)
++
+ add_subdirectory(SRC)
+ 
+ if(ENABLE_TESTS)
+@@ -44,4 +67,3 @@
+   ${CLAPACK_BINARY_DIR}/clapack-config-version.cmake @ONLY)
+ configure_file(${CLAPACK_SOURCE_DIR}/clapack-config.cmake.in
+   ${CLAPACK_BINARY_DIR}/clapack-config.cmake @ONLY)
+-
+diff -ruN clapack-3.2.1-CMAKE.1.allexfb/SRC/CMakeLists.txt clapack-3.2.1-CMAKE/SRC/CMakeLists.txt
+--- clapack-3.2.1-CMAKE.1.allexfb/SRC/CMakeLists.txt	2011-06-19 22:13:44.000000000 +0200
++++ clapack-3.2.1-CMAKE/SRC/CMakeLists.txt	2011-06-19 22:15:04.000000000 +0200
+@@ -380,7 +380,7 @@
+ endif()
+ 
+ add_library(clapack SHARED ${ALLOBJ} ${ALLXOBJ})
+-target_link_libraries(clapack blas f2c m)
++target_link_libraries(clapack ${BLAS_LIBRARIES} f2c m)
+ set_target_properties(clapack PROPERTIES SOVERSION "${CLAPACK_VERSION}")
+ 
+ install(
diff --git a/sci-libs/clapack/files/clapack-3.2.1-hang.patch b/sci-libs/clapack/files/clapack-3.2.1-hang.patch
new file mode 100644
index 0000000..648516f
--- /dev/null
+++ b/sci-libs/clapack/files/clapack-3.2.1-hang.patch
@@ -0,0 +1,15 @@
+Fix for https://bugs.kde.org/show_bug.cgi?id=274940
+
+diff -ruN clapack-3.2.1-CMAKE.orig/SRC/CMakeLists.txt clapack-3.2.1-CMAKE/SRC/CMakeLists.txt
+--- clapack-3.2.1-CMAKE.orig/SRC/CMakeLists.txt	2009-08-10 19:47:54.000000000 +0200
++++ clapack-3.2.1-CMAKE/SRC/CMakeLists.txt	2011-06-19 02:17:34.119752822 +0200
+@@ -355,6 +355,9 @@
+    zla_heamv.c zla_hercond_c.c zla_hercond_x.c zla_herpvgrw.c		
+    zla_lin_berr.c zlarscl2.c zlascl2.c zla_wwaddw.c)
+ 
++if(CMAKE_COMPILER_IS_GNUCXX)
++   set_source_files_properties(dlamch.c slamch.c PROPERTIES COMPILE_FLAGS "-ffloat-store -O0")
++endif()
+ 
+ if( USEXBLAS)
+   set(ALLXOBJ ${SXLASRC} ${DXLASRC} ${CXLASRC} ${ZXLASRC} ${ALLXAUX})