[sci-libs/clapack] Abort attempts about removing Fortran; resync with tree

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

5 files changed, 58 insertions, 34 deletions

diff --git a/sci-libs/clapack/ChangeLog b/sci-libs/clapack/ChangeLog
index b93386d..1d9cf28 100644
--- a/sci-libs/clapack/ChangeLog
+++ b/sci-libs/clapack/ChangeLog
@@ -2,6 +2,11 @@
 # 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 $
 
+  30 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  clapack-3.2.1-r4.ebuild, +files/clapack-3.2.1-fix_include_file.patch,
+  files/clapack-3.2.1-noblasf2c.patch:
+  Abort attempts about removing Fortran; resync with tree
+
   11 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   clapack-3.2.1-r3.ebuild:
   Resync with tree
diff --git a/sci-libs/clapack/Manifest b/sci-libs/clapack/Manifest
index d0e1f8e..501ec2e 100644
--- a/sci-libs/clapack/Manifest
+++ b/sci-libs/clapack/Manifest
@@ -2,29 +2,30 @@
 Hash: SHA512
 
 AUX 3.2.1-solib.patch 844 RMD160 a756639bdf6acdb0f017de592efec88798769155 SHA1 a04f2a910b633f2a5b4e9d1728670486ae8df504 SHA256 da2d1befec291f905c03bd6d73f74f361130ef22ad2629aa5edec8ee5e0d5b53
+AUX clapack-3.2.1-fix_include_file.patch 689 RMD160 1140593aa3d24e749e86b2c15f01b59512287c02 SHA1 eec4b685ab1b09333e7d5cb5d2d1419815935b9f SHA256 9b6024cecbfb152d910b8fb878db6918704388479876719b43f4378992581603
 AUX clapack-3.2.1-noblasf2c-r4.patch 5852 RMD160 7dea18e7fd5bf378ba9f6495e457c931b8ee7bd6 SHA1 1bbc3178c09832d4654d8d854a4156bf61c81112 SHA256 39c6ed8e878b0fe74c1eba9745d60ea35611596b4ab68191e42fe3dc0f7a14a3
-AUX clapack-3.2.1-noblasf2c.patch 5839 RMD160 d30ff26a4ac811442d37af80bc6335f942b80505 SHA1 b16b68b076927299c32ec85d74790259d8ffb81f SHA256 cd1807a0d61a1dc51f0ef7d1e46c50c84a60f846ec6dfab380dc568e247ecc07
+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
 DIST clapack-3.2.1.tgz 7221385 RMD160 5882b199595ae0ce6769cd65cb83cfeb7dcac528 SHA1 fdab49c89a1843643fdfa9121f16361e23711540 SHA256 f1c214f97033deff6e91dee72be56cd14d872a097e35a1ef1beeadaf4e1921bc
 EBUILD clapack-3.2.1-r2.ebuild 1544 RMD160 3e61910680dbb57e316705330e796fd1ed456073 SHA1 6117683296ea4136f240930e423d29b0be096ab1 SHA256 8e41637befd64a4678e37261de995efe357121b91686a0378c10c1f45a3ac73f
 EBUILD clapack-3.2.1-r3.ebuild 770 RMD160 72d2e792b30db7b8820095d88f9f8f6aa776393f SHA1 269f169309a273228d948fc10e20400616e5e326 SHA256 667d88d56748e8c7635e37ed8c2f4e3feba2ae25f2921a61cd9599ae098de265
-EBUILD clapack-3.2.1-r4.ebuild 743 RMD160 4e7d4427c6668f476d3487cf3b2c1123f0e0547a SHA1 c6e57dc5bf4d90caa30c85e42c4c31ebd76bf9e4 SHA256 a1180c47b8676289f6a319ac714afdbae8f238890197eaa2b0685811bedabb93
-MISC ChangeLog 1937 RMD160 d0a183b56cc62e58398d8722e5f655c64bae81ad SHA1 ddda3dfa1843f2b4876d8732c4a291bec7cea442 SHA256 4480d89aee746d50823b070c704e061b6dcf332836cc2023120e870371965436
+EBUILD clapack-3.2.1-r4.ebuild 758 RMD160 e9fbc7623a96c454768e5c3c7feb4cd352d821e9 SHA1 c8b6815878306b1755a4af57de8d3d425f69ed43 SHA256 9f261f591530818cea8c45852264ad060e86b81a791fde20d4d030f7b6f047b4
+MISC ChangeLog 2164 RMD160 eab98a85130c952a6dd005be09b3f32a828c7318 SHA1 ab09393801e88628bd89988b59414f1a1890339a SHA256 c41dbe37147c49ff745d287c2305e9c104904b18cd9a6549eb14150d5a13af2e
 MISC metadata.xml 581 RMD160 aa5fd2f24c925ba53410c2a6b2b9e357a79a5e22 SHA1 6d88ecc9bfaa1d1711cfb76d307b41b0ccd5f429 SHA256 c7fdad96aad5a3bbb64f5ea60fbacfa7cf51175b32a3c8c187df749a6206e393
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNo33hAAoJENwGBM22xffe4c4P/1Qfj0Wljbb63ZvLOkRDHubC
-HO3xgdB5UEJA7aedxB14/C089fUjPlKYTthkjz+Y4/JXDCZX+jsyqD+ojy3eCj3t
-4eMU3/yfv1oiccGtH+nqlDejfpsqohOfkzIjXT8HP5NUp6uMmihhYAukzBNby2K6
-YJS3twyOyfmuZ97b5/LNaI6zOdXLfr5snrHaywHztRYfbSCauxdON9A1/07joDWB
-K8dWgrudO1AsOtKDaXSTBhQQEiaXe09/pgZ3L0oLaCfJUkcFz5HxFK14N/eBUr0o
-9FkOyyDLG6viumxWGHcK6h6MfBk1OTouCTTdHTQUe+iKrjo6xR2SDEDfmp5OaTAH
-et2Wpf/2HfYKRXJFS5uywShZnMWLY1tuXwNubsnheXGtvU1BQcZO0yjLCDgm0hFj
-ahcfJO3X8oD4pYbQ1ElipWjy9eDImbCoRWFETZAN33NDHdj0J6uvQ/CcliePIpsb
-UKCiqZrObl++sGWiAUsq6hMs1xLvH/hOhPEEl3XrbBGg7QlJn0wfucwhiqylaXBb
-yjDrq3+7xxoYRCFH1jFhW4mlzAYPJRrj+bz58aifoH2fQ3RDppUr2JgLcjXK7GLK
-m7lT5nrgRslTEQ6LeAmfF4in6kX3FOalcLseSwxBj2SvOVFDadtnCwUBKaMXSa4n
-wOMNn80kTkSyTipvV9nS
-=e7Ty
+iQIcBAEBCgAGBQJNvDKyAAoJENwGBM22xffeT/cQAIOIm0LpzJjBmtx3mB+y/poJ
+QPtE2MHJ8U2tWprc4vgppX3ZTqRehdMJyq4BWOHEy0Gv7FiFZcd23drSmbhDcwqu
+Pp0zZd6S4cArZrOogCSqmMKFtDDzIjWigVwNxpCRvo14gqPirwZwwlj3noXUPoYC
+gBKJdeMhuSBRXDBgTr8PgCURixYn4M6UDRcNs938E8xPzItck8XlROL3wpaQTUex
+v7OAOJJ0Izjv+bTn56ps0f8RKbesAJxodLIK2KtH0LxIIUyoeHLG3KC0gPTBlJJ6
+Gc3cdSAP2znqtT+3hABCPpP1xh9uBBtqWYqCsWjJEAsXfXpRxJBmbM4AbXTc2JGM
+T57nrJt8NB/2Z2z0jjNBRxzMFmCp9qDE9byLT+C5ygYGyZe/f9CiYjDJ4NOcExXA
+FnnQhMs45irk79A7Nf5Hjh5ToHTNzcZempfLnqUbFoCtq08wMQtnb7rY7K3u5aDM
+LZ0cNx2KoUeYHmxGgxKDSOy3w5QBRptoMTeRE14u47AYpahdHr9/ioZ2WNVISSXa
+SrgYG9BIrjXPv8eEOATbZvYnrplW5OlEFUeodlM3+E+IMXnWn5kOA8FrAt9cyarC
+yjakPSK8aV3M05UPte02LB2MKdCFMuAI3aM13tyzRyqn64HDfq9mpdwC15JHfl6t
+eiZoR9b4w7a8P8bcF+dR
+=baC5
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/clapack/clapack-3.2.1-r4.ebuild b/sci-libs/clapack/clapack-3.2.1-r4.ebuild
index 517bc35..ed5db62 100644
--- a/sci-libs/clapack/clapack-3.2.1-r4.ebuild
+++ b/sci-libs/clapack/clapack-3.2.1-r4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/clapack-3.2.1-r4.ebuild,v 1.1 2011/04/30 09:50:09 scarabeus Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit eutils cmake-utils
+inherit base cmake-utils
 
 DESCRIPTION="f2c'ed version of LAPACK"
 HOMEPAGE="http://www.netlib.org/clapack/"
@@ -12,26 +12,19 @@ SRC_URI="http://www.netlib.org/${PN}/${P}-CMAKE.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-libs/libf2c-20090407-r1
-	virtual/cblas"
+	virtual/blas"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${P}-CMAKE
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-noblasf2c-r4.patch
-
-	sed \
-		-e 's:"f2c.h":<f2c.h>:g' \
-		-i SRC/*.c || die
-
-	sed \
-		-e 's:"blas.h":<cblas.h>:g' \
-		-i SRC/*.c || die
-}
+PATCHES=(
+	"${FILESDIR}/${P}-fix_include_file.patch"
+	"${FILESDIR}/${P}-noblasf2c.patch"
+)
 
 src_configure() {
 	local mycmakeargs=( $(cmake-utils_use_enable test TESTS) )
diff --git a/sci-libs/clapack/files/clapack-3.2.1-fix_include_file.patch b/sci-libs/clapack/files/clapack-3.2.1-fix_include_file.patch
new file mode 100644
index 0000000..002336f
--- /dev/null
+++ b/sci-libs/clapack/files/clapack-3.2.1-fix_include_file.patch
@@ -0,0 +1,25 @@
+diff -urN clapack-3.2.1-CMAKE.old/INCLUDE/clapack.h clapack-3.2.1-CMAKE/INCLUDE/clapack.h
+--- clapack-3.2.1-CMAKE.old/INCLUDE/clapack.h	2011-04-30 11:39:51.000000000 +0200
++++ clapack-3.2.1-CMAKE/INCLUDE/clapack.h	2011-04-30 11:40:39.000000000 +0200
+@@ -3,6 +3,12 @@
+ #ifndef __CLAPACK_H
+ #define __CLAPACK_H
+ 
++#include <f2c.h>
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* Subroutine */ int caxpy_(integer *n, complex *ca, complex *cx, integer *
+ 	incx, complex *cy, integer *incy);
+ 
+@@ -7250,5 +7256,8 @@
+ integer ilaenv_(integer *ispec, char *name__, char *opts, integer *n1, 
+ 	integer *n2, integer *n3, integer *n4);
+ 
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif /* __CLAPACK_H */
diff --git a/sci-libs/clapack/files/clapack-3.2.1-noblasf2c.patch b/sci-libs/clapack/files/clapack-3.2.1-noblasf2c.patch
index 53e3589..5ae9e63 100644
--- a/sci-libs/clapack/files/clapack-3.2.1-noblasf2c.patch
+++ b/sci-libs/clapack/files/clapack-3.2.1-noblasf2c.patch
@@ -66,7 +66,7 @@ diff -u -r -N clapack-3.2.1-CMAKE.orig/SRC/CMakeLists.txt clapack-3.2.1-CMAKE/SR
 -target_link_libraries(lapack blas)
  
 +add_library(clapack SHARED ${ALLOBJ} ${ALLXOBJ})
-+target_link_libraries(clapack blas f2c)
++target_link_libraries(clapack blas f2c m)
 +set_target_properties(clapack PROPERTIES SOVERSION "${CLAPACK_VERSION}")
 +
 +install(