[gentoo-commits] proj/sci:master commit in: sci-libs/lapacke-reference/, sci-libs/lapacke-reference/files/

["Sebastien Fabbro" <bicatali@gentoo.org>]

commit:     edbd0f3b68f9aed18d857108fa9ab72dfebac70e
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu May 23 05:13:31 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu May 23 05:13:31 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=edbd0f3b

sci-libs/lapacke-reference: Switch to EAPI5

Package-Manager: portage-2.2.01.21938-prefix

---
 sci-libs/lapacke-reference/ChangeLog               |    6 +-
 .../files/lapack-3.4.1-cmake.patch                 |  208 --------------------
 .../lapacke-reference-3.4.2.ebuild                 |    6 +-
 3 files changed, 8 insertions(+), 212 deletions(-)

diff --git a/sci-libs/lapacke-reference/ChangeLog b/sci-libs/lapacke-reference/ChangeLog
index a26b128..5efd3ad 100644
--- a/sci-libs/lapacke-reference/ChangeLog
+++ b/sci-libs/lapacke-reference/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/lapacke-reference
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 May 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/lapack-3.4.1-cmake.patch, lapacke-reference-3.4.2.ebuild:
+  sci-libs/lapacke-reference: Switch to EAPI5
+
   29 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org>
   -lapacke-reference-3.4.1.ebuild, lapacke-reference-3.4.2.ebuild, metadata.xml:
   sci-libs/lapacke-reference: added tmg for testing, cleaning up ebuild

diff --git a/sci-libs/lapacke-reference/files/lapack-3.4.1-cmake.patch b/sci-libs/lapacke-reference/files/lapack-3.4.1-cmake.patch
deleted file mode 100644
index 78dece8..0000000
--- a/sci-libs/lapacke-reference/files/lapack-3.4.1-cmake.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt	(revision 1294)
-+++ CMakeLists.txt	(working copy)
-@@ -94,10 +94,6 @@
- # Precision to build
- # By default all precisions are generated
- 
--option(BUILD_SINGLE "Build LAPACK Single Precision" ON)
--option(BUILD_DOUBLE "Build LAPACK Double Precision" ON)
--option(BUILD_COMPLEX "Build LAPACK Complex Precision" ON)
--option(BUILD_COMPLEX16 "Build LAPACK Double Complex Precision" ON)
- 
- # --------------------------------------------------
- # Subdirectories that need to be processed
-@@ -147,7 +143,49 @@
-   find_library(XBLAS_LIBRARY NAMES xblas)
- endif(USE_XBLAS)
-    
--add_subdirectory(SRC)
-+option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library instead of included netlib LAPACK" OFF)
-+
-+# Check the usage of the user provided LAPACK libraries
-+if(LAPACK_LIBRARIES)
-+  include(CheckFortranFunctionExists)
-+  set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES})
-+  CHECK_FORTRAN_FUNCTION_EXISTS("dpotrf" LAPACK_FOUND)
-+  unset( CMAKE_REQUIRED_LIBRARIES )
-+  if(LAPACK_FOUND)
-+    message(STATUS "--> LAPACK supplied by user is WORKING, will use ${LAPACK_LIBRARIES}.")
-+  else(LAPACK_FOUND)
-+    message(ERROR "--> LAPACK supplied by user is not WORKING, CANNOT USE $LAPACK_LIBRARIES}.")
-+    message(ERROR "-->     Will use REFERENCE LAPACK (by default)")
-+    message(ERROR "-->     Or Correct your LAPACK_LIBRARIES entry ")
-+    message(ERROR "-->     Or Consider checking USE_OPTIMIZED_LAPACK")
-+  endif(LAPACK_FOUND)
-+  
-+  # User did not provide a LAPACK Library but specified to search for one
-+elseif( USE_OPTIMIZED_LAPACK )
-+  find_package( LAPACK )
-+endif (LAPACK_LIBRARIES)
-+
-+# Neither user specified or optimized LAPACK libraries can be used
-+if(NOT LAPACK_FOUND)
-+  message(STATUS "Using supplied NETLIB LAPACK implementation")
-+  set( LAPACK_LIBRARIES lapack )
-+  option(BUILD_SINGLE "Build LAPACK Single Precision" ON)
-+  option(BUILD_DOUBLE "Build LAPACK Double Precision" ON)
-+  option(BUILD_COMPLEX "Build LAPACK Complex Precision" ON)
-+  option(BUILD_COMPLEX16 "Build LAPACK Double Complex Precision" ON)
-+  add_subdirectory(SRC)
-+else()
-+  set( CMAKE_EXE_LINKER_FLAGS 
-+    "${CMAKE_EXE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
-+    CACHE STRING "Linker flags for executables" FORCE)
-+  set( CMAKE_MODULE_LINKER_FLAGS 
-+    "${CMAKE_MODULE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
-+    CACHE STRING "Linker flags for modules" FORCE)
-+  set( CMAKE_SHARED_LINKER_FLAGS 
-+    "${CMAKE_SHARED_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
-+    CACHE STRING "Linker flags for shared libs" FORCE)
-+endif( NOT LAPACK_FOUND )
-+
- if(BUILD_TESTING)
-   add_subdirectory(TESTING)
- endif(BUILD_TESTING)
-@@ -155,6 +193,10 @@
- # --------------------------------------------------
- # LAPACKE
- option(LAPACKE "Build LAPACKE" OFF)
-+if(LAPACKE)
-+  add_subdirectory(lapacke)
-+endif(LAPACKE)
-+
- # LAPACKE has also the interface to some routines from tmglib,
- # if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
- option(LAPACKE_WITH_TMG "Build LAPACKE with tmglib routines" OFF)
-@@ -162,9 +204,6 @@
-   option(LAPACKE "Build LAPACKE" ON)
- endif(LAPACKE_WITH_TMG)
- 
--if(LAPACKE)
--  add_subdirectory(lapacke)
--endif(LAPACKE)
- 
- # --------------------------------------------------
- # CPACK Packaging 
-@@ -202,20 +241,24 @@
- OPTION(BUILD_STATIC_LIBS "Build static libraries" ON )
- #OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON )
- 
--if( NOT BLAS_FOUND )
--  if(LAPACKE)
--     export(TARGETS blas lapack tmglib lapacke FILE lapack-targets.cmake)
--  else (LAPACKE)
--     export(TARGETS blas lapack tmglib FILE lapack-targets.cmake)
--  endif(LAPACKE)
--else( NOT BLAS_FOUND )
--  if(LAPACKE)
--     export(TARGETS lapack tmglib lapacke FILE lapack-targets.cmake)
--  else (LAPACKE)
--     export(TARGETS lapack tmglib FILE lapack-targets.cmake)
--  endif(LAPACKE)
--endif( NOT BLAS_FOUND )
-+if(NOT BLAS_FOUND)
-+  set(ALL_TARGETS ${ALL_TARGETS} blas)
-+endif(NOT BLAS_FOUND)
- 
-+if(NOT LAPACK_FOUND)
-+  set(ALL_TARGETS ${ALL_TARGETS} lapack)
-+endif(NOT LAPACK_FOUND)
-+
-+if(BUILD_TESTING OR LAPACKE_WITH_TMG)
-+  set(ALL_TARGETS ${ALL_TARGETS} tmglib)
-+endif(BUILD_TESTING OR LAPACKE_WITH_TMG)
-+
-+if(LAPACKE)
-+  set(ALL_TARGETS ${ALL_TARGETS} lapacke)
-+endif(LAPACKE)
-+
-+export(TARGETS ${ALL_TARGETS} FILE lapack-targets.cmake)
-+
- configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-version.cmake.in
-   ${LAPACK_BINARY_DIR}/lapack-config-version.cmake @ONLY)
- configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
-Index: lapacke/example/CMakeLists.txt
-===================================================================
---- lapacke/example/CMakeLists.txt	(revision 1294)
-+++ lapacke/example/CMakeLists.txt	(working copy)
-@@ -1,8 +1,8 @@
- add_executable(xexample_DGESV_rowmajor example_DGESV_rowmajor.c)
- add_executable(xexample_ZGESV_rowmajor example_ZGESV_rowmajor.c)
- 
--target_link_libraries(xexample_DGESV_rowmajor lapacke lapack ${BLAS_LIBRARIES})
--target_link_libraries(xexample_ZGESV_rowmajor lapacke lapack ${BLAS_LIBRARIES})
-+target_link_libraries(xexample_DGESV_rowmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-+target_link_libraries(xexample_ZGESV_rowmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
- 
- add_test(example_DGESV_rowmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGESV_rowmajor)
- add_test(example_ZGESV_rowmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_ZGESV_rowmajor)
-Index: lapacke/CMakeLists.txt
-===================================================================
---- lapacke/CMakeLists.txt	(revision 1294)
-+++ lapacke/CMakeLists.txt	(working copy)
-@@ -45,14 +45,14 @@
- 
- if (USE_XBLAS)
-    add_library(lapacke ${SRC_OBJ} ${SRCX_OBJ} ${UTILS_OBJ})
--   target_link_libraries(lapacke lapack ${BLAS_LIBRARIES}  ${XBLAS_LIBRARY})
-+   target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
- else (USE_XBLAS)
-   if (LAPACKE_WITH_TMG)
-    add_library(lapacke ${SRC_OBJ} ${MATGEN_OBJ} ${UTILS_OBJ})
--   target_link_libraries(lapacke tmglib lapack ${BLAS_LIBRARIES} )
-+   target_link_libraries(lapacke tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-   else (LAPACKE_WITH_TMG)
-    add_library(lapacke ${SRC_OBJ} ${UTILS_OBJ})
--   target_link_libraries(lapacke lapack ${BLAS_LIBRARIES} )
-+   target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-   endif(LAPACKE_WITH_TMG)
- endif(USE_XBLAS)
- 
-Index: TESTING/LIN/CMakeLists.txt
-===================================================================
---- TESTING/LIN/CMakeLists.txt	(revision 1294)
-+++ TESTING/LIN/CMakeLists.txt	(working copy)
-@@ -193,7 +193,7 @@
- 
- macro(add_lin_executable name )
-   add_executable(${name} ${ARGN})
--  target_link_libraries(${name} tmglib lapack)
-+  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES})
- endmacro(add_lin_executable)
- 
- IF(BUILD_SINGLE)
-Index: TESTING/EIG/CMakeLists.txt
-===================================================================
---- TESTING/EIG/CMakeLists.txt	(revision 1294)
-+++ TESTING/EIG/CMakeLists.txt	(working copy)
-@@ -119,7 +119,7 @@
- 
- macro(add_eig_executable name )
-   add_executable(${name} ${ARGN})
--  target_link_libraries(${name} tmglib lapack )
-+  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES})
- endmacro(add_eig_executable)
- 
- if (BUILD_SINGLE)
-Index: TESTING/MATGEN/CMakeLists.txt
-===================================================================
---- TESTING/MATGEN/CMakeLists.txt	(revision 1294)
-+++ TESTING/MATGEN/CMakeLists.txt	(working copy)
-@@ -64,12 +64,12 @@
-   set(ALLOBJ ${ALLOBJ} ${ZMATGEN} ${DZATGEN})
- endif()
- 
--list(REMOVE_DUPLICATES ALLOBJ)
--
- if (NOT ALLOBJ)
- set(ALLOBJ ${SMATGEN} ${CMATGEN} ${SCATGEN} ${DMATGEN} ${ZMATGEN}
-   ${DZATGEN})
-+else()
-+  list(REMOVE_DUPLICATES ALLOBJ)
- endif()
- add_library(tmglib ${ALLOBJ} )
--target_link_libraries(tmglib lapack)
-+target_link_libraries(tmglib ${LAPACK_LIBRARIES})
- lapack_install_library(tmglib)

diff --git a/sci-libs/lapacke-reference/lapacke-reference-3.4.2.ebuild b/sci-libs/lapacke-reference/lapacke-reference-3.4.2.ebuild
index f8224d4..cdf324a 100644
--- a/sci-libs/lapacke-reference/lapacke-reference-3.4.2.ebuild
+++ b/sci-libs/lapacke-reference/lapacke-reference-3.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit alternatives-2 cmake-utils eutils fortran-2 toolchain-funcs
 
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MYP}"
 
 src_prepare() {
-	# avoid collision with other lapack
+	# rename libraries to avoid collision with other lapacke
 	sed -i \
 		-e 's:BINARY_DIR}/lapacke.pc:BINARY_DIR}/reflapacke.pc:' \
 		-e '/export/s:lapacke:reflapacke:g' \