[sci-libs/clapack] Builds and installs correctly. All tests succeed.

(Portage version: 2.1.8.3/git/Linux x86_64)
 (Signed Manifest commit)

5 files changed, 79 insertions, 52 deletions

diff --git a/sci-libs/clapack/ChangeLog b/sci-libs/clapack/ChangeLog
index 4eeb45a..c0e431a 100644
--- a/sci-libs/clapack/ChangeLog
+++ b/sci-libs/clapack/ChangeLog
@@ -3,6 +3,11 @@
 # $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/ChangeLog,v 1.5 2010/04/25 11:32:11 jlec Exp $
 
   27 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
+  -files/3.2.1-solib.patch, clapack-3.2.1-r3.ebuild,
+  files/clapack-3.2.1-noblasf2c.patch:
+  Compiles and installs correctly. All tests succeed.
+
+  27 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
   files/clapack-3.2.1-noblasf2c.patch:
   First version that installs, still buggy
 
diff --git a/sci-libs/clapack/Manifest b/sci-libs/clapack/Manifest
index b7fe800..ff3b90c 100644
--- a/sci-libs/clapack/Manifest
+++ b/sci-libs/clapack/Manifest
@@ -1,6 +1,25 @@
-AUX 3.2.1-solib.patch 844 RMD160 a756639bdf6acdb0f017de592efec88798769155 SHA1 a04f2a910b633f2a5b4e9d1728670486ae8df504 SHA256 da2d1befec291f905c03bd6d73f74f361130ef22ad2629aa5edec8ee5e0d5b53
-AUX clapack-3.2.1-noblasf2c.patch 4889 RMD160 dc4fd7d5e11dd31edbcbd0c22eab52991deca17b SHA1 51b3f67a07abd29e26555b6a676cb4d67fa044e8 SHA256 52f48d0170c096e14edafe28b34da8e1c456907b28b7cf0cc7ee995772d68c3e
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX clapack-3.2.1-noblasf2c.patch 5715 RMD160 32359ceb2adf975580dbe6286a6d0a1f1ad3e380 SHA1 b0a546a26a355eed30ffa25a97f4e50c97def127 SHA256 fda50aeb3f753cdf61536840044f9632764dd162938b136e728929f6c98029a0
 DIST clapack-3.2.1-CMAKE.tgz 6017667 RMD160 42af2b40a78b0cc4020a961a2fe0faf73c20560c SHA1 5ea1bcc4314e392bca8b9e5f61d44355cf9f4cc1 SHA256 0b3f782bc24845d85f36bafbff0f2f1384dc72df730fda4e7924ec1a70baca5a
-EBUILD clapack-3.2.1-r3.ebuild 1111 RMD160 5e70a661ecd2b8b531febb90fd03e0d25d8088ec SHA1 1fa653be34a197075093f2c375fbc89bd5e8a74c SHA256 438475abae742652162fe3cbe52fc0c90ab6b4408f56d3a41bb3aa8b670e29ee
-MISC ChangeLog 1595 RMD160 11e42c26f0852962df45882ddecc18d93f6fa760 SHA1 15e47bc5b020f4398046f62c92fcb5aba860cfd5 SHA256 f722f8fdc996071967a28c98f44d3215e52d71114def263c868d1bb80efdb6b0
+EBUILD clapack-3.2.1-r3.ebuild 813 RMD160 f5a883581aec697fd1be56f6901959901fd3165a SHA1 6d139b5d97027606bc7bd7993e649d23d5030f99 SHA256 727c732b73e96986bf5f8c6622911320a4a60ae6e2c246b564f30b0e071e463e
+MISC ChangeLog 1808 RMD160 1f58bd7245371dbfb00f84cf62557bf5683756f5 SHA1 567e437f3aabe4c18a382342bcb59ea50dfa7cf8 SHA256 6ca7fc6a2142be8179407585de5059c929be3c2f230235b58f8ecef030089a08
 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBAgAGBQJMeDXyAAoJENwGBM22xffeG9AP/2B2lKmMmMt5nmcEr04Qoe/u
+VRBB8rBoSef0RLbYg//T4GKGDzc3bh9HL9AOb8cE4sVOzPVT1Vh7/AbaNXArB10t
+MTIshhkncqSREN4OtlsAnoQVtjB0mJJQi8SZpCFPXwJKIlg0n4uTJSbI0WY4IE/p
+mHsPR+lGqG4kn1soTtEZzXm5WpD9KTr7P2bXPTRR0y7gNSfV1X7P3dwWsdjOYcvh
+znYgUbEPuWm2SyEqZlJephx2OzF7TCobytWYqyPMyhPqYI/nHX+tWS1YoXKnBKMz
+XTCN+i0XfFEraWN8x9sw+hby0DNJ3SJk1/wViZII5WzrOXp8JnCSp9j5cyhZFo0a
+45Gz2qUEUa0EjQiaEjXYvxlSx4ww8M+9jcxbX30vYI+IYSWKqfw4V2n0mfUxKBO3
+gQU2+V7k7zuLdibhk1VpgKws/5mS5K1Oj+SVNO2Ah4tAuX9QHAV1fnZroVzHFMbe
+z8ioU3vk9jyQTKtkeNKbGPOXCGF8+EyDidGPXyBYkFRjAFzcDeUNSKhtSk3x1t8B
+sg1Hyei4KGPxivmE8ScFoAZKNxY3rj1ZrHZDvj/c74jLgh6P3qcIVrLg7BzwngUK
+Veu5ZCZ3T2gMkCuau759cs6LCl/9nf0E/OmV3LchtYncVezj15rf9QvLTFZnZDta
+tHMAd23xTTCUI5G1bH3O
+=NbgK
+-----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
index 8206e31..363d948 100644
--- a/sci-libs/clapack/clapack-3.2.1-r3.ebuild
+++ b/sci-libs/clapack/clapack-3.2.1-r3.ebuild
@@ -17,24 +17,18 @@ IUSE=""
 
 RDEPEND=">=dev-libs/libf2c-20081126[static-libs]"
 DEPEND="${RDEPEND}"
+
 S="${WORKDIR}"/clapack-${PV}-CMAKE
 
 src_prepare() {
-	rm -rf F2CLIBS BLAS
-
 	epatch "${FILESDIR}"/${P}-noblasf2c.patch
 
-#	epatch "${FILESDIR}"/${PV}-solib.patch
-#
-	sed \
-		-e "s:^CC.*$:CC = $(tc-getCC):g" \
-		-e "s:^CFLAGS.*$:CFLAGS = ${CFLAGS} -fPIC:g" \
-		-e "s:^LOADER.*$:LOADER = $(tc-getCC):g" \
-		-e "s:^LOADOPTS.*$:LOADOPTS = ${LDFLAGS} -Wl,-soname,libclapack.so.$(get_version_component_range 1-2):g" \
-		-e "s:LAPACKLIB.*$:LAPACKLIB = libclapack.so.${PV}:g" \
-		make.inc.example > make.inc
-
 	sed \
 		-e 's:"f2c.h":<f2c.h>:g' \
 		-i SRC/*.c || die
 }
+
+src_configure() {
+	mycmakeargs=( $(cmake-utils_use_enable test TESTS) )
+	cmake-utils_src_configure
+}
diff --git a/sci-libs/clapack/files/3.2.1-solib.patch b/sci-libs/clapack/files/3.2.1-solib.patch
deleted file mode 100644
index c35a5f7..0000000
--- a/sci-libs/clapack/files/3.2.1-solib.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/SRC/Makefile b/SRC/Makefile
-index 47bea67..bc23ad8 100644
---- a/SRC/Makefile
-+++ b/SRC/Makefile
-@@ -367,8 +367,7 @@ ALLOBJ=$(SLASRC) $(DLASRC) $(CLASRC) $(ZLASRC) $(SCLAUX) $(DZLAUX)	\
- 	$(ALLAUX)
- 
- ../$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ)
--	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ)
--	$(RANLIB) $@
-+	$(CC) $(LOADOPTS) -shared -o $@ $(ALLOBJ) $(ALLXOBJ) -lf2c
- 
- single: $(SLASRC) $(ALLAUX) $(SCLAUX) 
- 	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(ALLAUX) \
-diff --git a/make.inc.example b/make.inc.example
-index 0ac8bbb..5a0eac6 100644
---- a/make.inc.example
-+++ b/make.inc.example
-@@ -27,7 +27,7 @@ CC        = gcc
- CFLAGS    = -O3 
- LOADER    = gcc
- LOADOPTS  =
--NOOPT     = -O0 
-+NOOPT     = -O0 -fPIC
- DRVCFLAGS = $(CFLAGS)
- F2CCFLAGS = $(CFLAGS)
- #######################################################################
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 156b1f9..1c05b32 100644
--- a/sci-libs/clapack/files/clapack-3.2.1-noblasf2c.patch
+++ b/sci-libs/clapack/files/clapack-3.2.1-noblasf2c.patch
@@ -1,21 +1,55 @@
 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-27 01:56:16.000000000 +0200
-@@ -18,8 +18,6 @@
++++ clapack-3.2.1-CMAKE/CMakeLists.txt	2010-08-27 23:58:13.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)
+-add_subdirectory(SRC)
+-add_subdirectory(TESTING)
++
  set(CLAPACK_VERSION 3.2.1)
-@@ -27,8 +25,9 @@
+ 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
@@ -23,19 +57,21 @@ diff -u -r -N clapack-3.2.1-CMAKE-orig/CMakeLists.txt clapack-3.2.1-CMAKE/CMakeL
 +
 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-27 08:51:54.000000000 +0200
-@@ -375,6 +375,9 @@
++++ clapack-3.2.1-CMAKE/SRC/CMakeLists.txt	2010-08-27 23:49:41.000000000 +0200
+@@ -375,6 +375,11 @@
  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 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 +
-+install(FILES ../INCLUDE/clapack.h DESTINATION include)
++install(FILES ../INCLUDE/clapack.h DESTINATION include/clapack)
 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-27 00:26:48.000000000 +0200