Now uses cmake tar ball. Added a patch from dilfridge that adds a shared library, an install target, builds test on request, and provides a clapack-config.cmake. So far, no more static libraries is being built.

Package-Manager: portage-2.2_rc68/cvs/Linux x86_64

5 files changed, 251 insertions, 11 deletions

diff --git a/sci-libs/clapack/ChangeLog b/sci-libs/clapack/ChangeLog
index e96cd01ec059..39f4a39d7d7d 100644
--- a/sci-libs/clapack/ChangeLog
+++ b/sci-libs/clapack/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-libs/clapack
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/ChangeLog,v 1.5 2010/04/25 11:32:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/ChangeLog,v 1.6 2010/08/29 17:22:24 bicatali Exp $
+
+*clapack-3.2.1-r3 (29 Aug 2010)
+
+  29 Aug 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  +clapack-3.2.1-r3.ebuild, +files/clapack-3.2.1-noblasf2c.patch,
+  metadata.xml:
+  Now uses cmake tar ball. Added a patch from dilfridge that adds a shared
+  library, an install target, builds test on request, and provides a
+  clapack-config.cmake. So far, no more static libraries is being built.
 
 *clapack-3.2.1-r2 (25 Apr 2010)
 
diff --git a/sci-libs/clapack/Manifest b/sci-libs/clapack/Manifest
index 43dfb588a425..56ec5bbee555 100644
--- a/sci-libs/clapack/Manifest
+++ b/sci-libs/clapack/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA1
 
 AUX 3.2.1-solib.patch 844 RMD160 a756639bdf6acdb0f017de592efec88798769155 SHA1 a04f2a910b633f2a5b4e9d1728670486ae8df504 SHA256 da2d1befec291f905c03bd6d73f74f361130ef22ad2629aa5edec8ee5e0d5b53
+AUX clapack-3.2.1-noblasf2c.patch 5839 RMD160 d30ff26a4ac811442d37af80bc6335f942b80505 SHA1 b16b68b076927299c32ec85d74790259d8ffb81f SHA256 cd1807a0d61a1dc51f0ef7d1e46c50c84a60f846ec6dfab380dc568e247ecc07
+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
-MISC ChangeLog 895 RMD160 79396790f52013bd9029fbde33aa3f5bb1d10074 SHA1 aeb01482aa81f6d25d48b6ed8dffa264bc04e3d7 SHA256 0a4dd516e798c7f92cc60f24f4f2fa2877e7fb8284f990198d535cefd7d99b5e
-MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
+EBUILD clapack-3.2.1-r3.ebuild 783 RMD160 9468017c3b759c73d34c48d5c3680f8c68a0b69b SHA1 bc980af5509c55c5bdb76129475451b80a0235a9 SHA256 dcd0a39e1526e7653910fc00fdeef93e726a72173581761eb9cd07a178daad1b
+MISC ChangeLog 1287 RMD160 102fa9ff0f341577f99438d462a1d6cda8d9ca0f SHA1 2f132a1f278bbf43fc17fb23f187d11444bebd21 SHA256 e4f0377916b72ba62ce64c6379eeb615ed6c74043bc02346bc8a54c87c4a8b28
+MISC metadata.xml 581 RMD160 aa5fd2f24c925ba53410c2a6b2b9e357a79a5e22 SHA1 6d88ecc9bfaa1d1711cfb76d307b41b0ccd5f429 SHA256 c7fdad96aad5a3bbb64f5ea60fbacfa7cf51175b32a3c8c187df749a6206e393
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkvUKEAACgkQgAnW8HDreRa88ACgx8uCGEb7P2Vz2rivMWzbyUkx
-MxQAniMGHtL4gWXaDuMucgW+DHJzHMC+
-=r4iQ
+iEYEARECAAYFAkx6opwACgkQ1ycZbhPLE2CIhACgjXth30tqsBtzhkcXCGu18Xfs
+WBUAn0owo71BJQdVVct/AOiI2mHz6JL9
+=DxZC
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/clapack/clapack-3.2.1-r3.ebuild b/sci-libs/clapack/clapack-3.2.1-r3.ebuild
new file mode 100644
index 000000000000..43cbe0c946e3
--- /dev/null
+++ b/sci-libs/clapack/clapack-3.2.1-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 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-r3.ebuild,v 1.1 2010/08/29 17:22:24 bicatali Exp $
+
+EAPI="3"
+
+inherit eutils 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 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libf2c-20081126"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}-CMAKE"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-noblasf2c.patch
+	rm -rf INCLUDE/f2c.h F2CLIBS
+}
+
+src_configure() {
+	mycmakeargs=( \
+		$(cmake-utils_use_enable static-libs STATIC)
+		$(cmake-utils_use_enable test TESTS)
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-libs/clapack/files/clapack-3.2.1-noblasf2c.patch b/sci-libs/clapack/files/clapack-3.2.1-noblasf2c.patch
new file mode 100644
index 000000000000..53e358991f7a
--- /dev/null
+++ b/sci-libs/clapack/files/clapack-3.2.1-noblasf2c.patch
@@ -0,0 +1,189 @@
+diff -u -r -N clapack-3.2.1-CMAKE.orig/CMakeLists.txt clapack-3.2.1-CMAKE/CMakeLists.txt
+--- clapack-3.2.1-CMAKE.orig/CMakeLists.txt	2009-08-10 20:46:33.000000000 +0200
++++ clapack-3.2.1-CMAKE/CMakeLists.txt	2010-08-28 14:04:30.000000000 +0200
+@@ -1,7 +1,10 @@
+ cmake_minimum_required(VERSION 2.6)
+ project(CLAPACK C)
+-enable_testing()
+-include(CTest)
++
++if(ENABLE_TESTS)
++   enable_testing()
++   include(CTest)
++endif(ENABLE_TESTS)
+ 
+ if(WIN32 AND NOT CYGWIN)
+   set(SECOND_SRC  ${CLAPACK_SOURCE_DIR}/INSTALL/winsecond.c)
+@@ -11,24 +14,34 @@
+   set(SECOND_SRC  ${CLAPACK_SOURCE_DIR}/INSTALL/second.c)
+   set(DSECOND_SRC  ${CLAPACK_SOURCE_DIR}/INSTALL/dsecnd.c)
+ endif()
+-enable_testing()
++
+ option(USE_BLAS_WRAP "pre-pend f2c_ to each function in blas" OFF)
+ if(NOT USE_BLAS_WRAP)
+ # _zrotg_ seems to be missing in the wrap header
+   add_definitions(-DNO_BLAS_WRAP)
+ endif()
++
+ include_directories(${CLAPACK_SOURCE_DIR}/INCLUDE)
+-add_subdirectory(F2CLIBS)
+-add_subdirectory(BLAS)
+-add_subdirectory(SRC)
+-add_subdirectory(TESTING)
++
+ set(CLAPACK_VERSION 3.2.1)
+ set(CPACK_PACKAGE_VERSION_MAJOR 3)
+ set(CPACK_PACKAGE_VERSION_MINOR 2)
+ set(CPACK_PACKAGE_VERSION_PATCH 1)
++
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
++
++add_subdirectory(SRC)
++
++if(ENABLE_TESTS)
++   add_subdirectory(TESTING)
++endif(ENABLE_TESTS)
++
+ include(CPack)
+-export(TARGETS f2c blas lapack FILE clapack-targets.cmake)
++
++export(TARGETS clapack FILE clapack-targets.cmake)
++
+ configure_file(${CLAPACK_SOURCE_DIR}/clapack-config-version.cmake.in
+   ${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 -u -r -N 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	2010-08-28 14:32:17.000000000 +0200
+@@ -375,6 +375,20 @@
+ if(BUILD_COMPLEX16)
+   set(ALLOBJ  ${ZLASRC} ${ALLAUX} ${DZLAUX})
+ endif()
+-add_library(lapack ${ALLOBJ} ${ALLXOBJ})
+-target_link_libraries(lapack blas)
+ 
++add_library(clapack SHARED ${ALLOBJ} ${ALLXOBJ})
++target_link_libraries(clapack blas f2c)
++set_target_properties(clapack PROPERTIES SOVERSION "${CLAPACK_VERSION}")
++
++install(
++  TARGETS clapack EXPORT clapack 
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++)
++
++install(
++  FILES ../INCLUDE/clapack.h DESTINATION include/clapack
++)
++
++install(
++  EXPORT clapack DESTINATION "share/cmake/Modules" FILE clapack-config.cmake
++)
+diff -u -r -N clapack-3.2.1-CMAKE.orig/TESTING/EIG/CMakeLists.txt clapack-3.2.1-CMAKE/TESTING/EIG/CMakeLists.txt
+--- clapack-3.2.1-CMAKE.orig/TESTING/EIG/CMakeLists.txt	2009-08-10 19:47:54.000000000 +0200
++++ clapack-3.2.1-CMAKE/TESTING/EIG/CMakeLists.txt	2010-08-28 13:46:40.000000000 +0200
+@@ -119,7 +119,7 @@
+ 
+ macro(add_eig_executable name )
+   add_executable(${name} ${ARGN})
+-  target_link_libraries(${name} tmglib lapack )
++  target_link_libraries(${name} tmglib clapack )
+ endmacro(add_eig_executable)
+ 
+ add_eig_executable(xeigtsts ${SEIGTST} ${SCIGTST} ${AEIGTST} 
+diff -u -r -N clapack-3.2.1-CMAKE.orig/TESTING/LIN/CMakeLists.txt clapack-3.2.1-CMAKE/TESTING/LIN/CMakeLists.txt
+--- clapack-3.2.1-CMAKE.orig/TESTING/LIN/CMakeLists.txt	2009-08-10 20:06:06.000000000 +0200
++++ clapack-3.2.1-CMAKE/TESTING/LIN/CMakeLists.txt	2010-08-28 13:46:40.000000000 +0200
+@@ -189,7 +189,7 @@
+ 
+ macro(add_lin_executable name )
+   add_executable(${name} ${ARGN})
+-  target_link_libraries(${name} tmglib lapack)
++  target_link_libraries(${name} tmglib clapack)
+ endmacro(add_lin_executable)
+ 
+ add_lin_executable(xlintsts ${ALINTST} ${SCLNTST} ${SLINTST} 
+diff -u -r -N clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/CMakeLists.txt clapack-3.2.1-CMAKE/TESTING/MATGEN/CMakeLists.txt
+--- clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/CMakeLists.txt	2009-08-10 19:47:54.000000000 +0200
++++ clapack-3.2.1-CMAKE/TESTING/MATGEN/CMakeLists.txt	2010-08-28 13:46:40.000000000 +0200
+@@ -65,5 +65,6 @@
+ if(BUILD_COMPLEX16)
+   set(ALLOBJ $(ZMATGEN) $(DZATGEN))
+ endif()
+-add_library(tmglib ${ALLOBJ} )
++
++add_library(tmglib ${ALLOBJ} i_len_trim.c i_ceiling.c )
+ 
+diff -u -r -N clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/i_ceiling.c clapack-3.2.1-CMAKE/TESTING/MATGEN/i_ceiling.c
+--- clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/i_ceiling.c	1970-01-01 01:00:00.000000000 +0100
++++ clapack-3.2.1-CMAKE/TESTING/MATGEN/i_ceiling.c	2010-08-28 13:46:40.000000000 +0200
+@@ -0,0 +1,38 @@
++/* file has been copied from the included f2c library - dilfridge */
++
++#include <f2c.h>
++
++#ifdef KR_headers
++integer i_sceiling(x) real *x;
++#else
++#ifdef __cplusplus
++extern "C" {
++#endif
++integer i_sceiling(real *x)
++#endif
++{
++#define CEIL(x) ((int)(x) + ((x) > 0 && (x) != (int)(x)))
++
++    return (integer) CEIL(*x);
++}
++#ifdef __cplusplus
++}
++#endif
++
++
++#ifdef KR_headers
++integer i_dceiling(x) doublereal *x;
++#else
++#ifdef __cplusplus
++extern "C" {
++#endif
++integer i_dceiling(doublereal *x)
++#endif
++{
++#define CEIL(x) ((int)(x) + ((x) > 0 && (x) != (int)(x)))
++
++    return (integer) CEIL(*x);
++}
++#ifdef __cplusplus
++}
++#endif
+diff -u -r -N clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/i_len_trim.c clapack-3.2.1-CMAKE/TESTING/MATGEN/i_len_trim.c
+--- clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/i_len_trim.c	1970-01-01 01:00:00.000000000 +0100
++++ clapack-3.2.1-CMAKE/TESTING/MATGEN/i_len_trim.c	2010-08-28 13:46:40.000000000 +0200
+@@ -0,0 +1,25 @@
++/* file has been copied from the included f2c library - dilfridge */
++
++#include <f2c.h>
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#ifdef KR_headers
++integer i_len_trim(s, n) char *s; ftnlen n;
++#else
++integer i_len_trim(char *s, ftnlen n)
++#endif
++{
++  int i;
++
++  for(i=n-1;i>=0;i--)
++    if(s[i] != ' ')
++      return i + 1;
++
++  return(0);
++}
++#ifdef __cplusplus
++}
++#endif
diff --git a/sci-libs/clapack/metadata.xml b/sci-libs/clapack/metadata.xml
index efb490d78817..054845427e54 100644
--- a/sci-libs/clapack/metadata.xml
+++ b/sci-libs/clapack/metadata.xml
@@ -1,8 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
-<maintainer>
-  <email>sci@gentoo.org</email>
-</maintainer>
+<longdescription lang="en">
+  LAPACK is a comprehensive library that does linear algebra
+  operations including matrix inversions, least squared solutions to
+  linear sets of equations, eigenvector analysis, singular value
+  decomposition, etc. It is a very comprehensive and reputable package
+  that has found extensive use in the scientific community.
+  This package installs the reference C implementation from Netlib,
+  generated from f2c. 
+</longdescription>
 </pkgmetadata>