* [gentoo-commits] repo/gentoo:master commit in: sci-libs/sundials/files/, sci-libs/sundials/
@ 2017-01-02 16:13 Sebastien Fabbro
0 siblings, 0 replies; 11+ messages in thread
From: Sebastien Fabbro @ 2017-01-02 16:13 UTC (permalink / raw
To: gentoo-commits
commit: ac85f06620366c1e817dfcf8d7a90055f08eef47
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 23:58:20 2016 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Jan 2 16:13:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac85f066
sci-libs/sundials: initial import
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-libs/sundials/Manifest | 1 +
.../files/sundials-2.7.0-underlinking-libdir.patch | 395 +++++++++++++++++++++
sci-libs/sundials/metadata.xml | 22 ++
sci-libs/sundials/sundials-2.7.0.ebuild | 74 ++++
4 files changed, 492 insertions(+)
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
new file mode 100644
index 00000000..53a6a98
--- /dev/null
+++ b/sci-libs/sundials/Manifest
@@ -0,0 +1 @@
+DIST sundials-2.7.0.tar.gz 12258093 SHA256 d39fcac7175d701398e4eb209f7e92a5b30a78358d4a0c0fcc23db23c11ba104 SHA512 c86c167538065a4109b36ae7c8f60f3d92184133cfa661b5acfccee052c38f40be865412a1746bb57907b61602c212c0f15e1e30ef29e8a49db6d46a75a28e69 WHIRLPOOL 3aabd2912e6be7d159d69853ecc76d9549cc6020344083c71cdcf43867e86d95d14862463c201270f9ff5a16536f4341d6e0eb466402870cf7ee6e7a45669667
diff --git a/sci-libs/sundials/files/sundials-2.7.0-underlinking-libdir.patch b/sci-libs/sundials/files/sundials-2.7.0-underlinking-libdir.patch
new file mode 100644
index 00000000..db47ac3
--- /dev/null
+++ b/sci-libs/sundials/files/sundials-2.7.0-underlinking-libdir.patch
@@ -0,0 +1,395 @@
+diff -Nur sundials-2.7.0.orig/src/arkode/CMakeLists.txt sundials-2.7.0/src/arkode/CMakeLists.txt
+--- sundials-2.7.0.orig/src/arkode/CMakeLists.txt 2016-09-26 22:16:52.000000000 +0000
++++ sundials-2.7.0/src/arkode/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
+@@ -127,7 +127,7 @@
+ PROPERTIES OUTPUT_NAME sundials_arkode CLEAN_DIRECT_OUTPUT 1)
+
+ # Install the ARKODE library
+- INSTALL(TARGETS sundials_arkode_static DESTINATION lib)
++ INSTALL(TARGETS sundials_arkode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ ENDIF(BUILD_STATIC_LIBS)
+
+@@ -146,8 +146,10 @@
+ SET_TARGET_PROPERTIES(sundials_arkode_shared
+ PROPERTIES VERSION ${arkodelib_VERSION} SOVERSION ${arkodelib_SOVERSION})
+
++ TARGET_LINK_LIBRARIES(sundials_arkode_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
++
+ # Install the ARKODE library
+- INSTALL(TARGETS sundials_arkode_shared DESTINATION lib)
++ INSTALL(TARGETS sundials_arkode_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ ENDIF(BUILD_SHARED_LIBS)
+
+diff -Nur sundials-2.7.0.orig/src/arkode/fcmix/CMakeLists.txt sundials-2.7.0/src/arkode/fcmix/CMakeLists.txt
+--- sundials-2.7.0.orig/src/arkode/fcmix/CMakeLists.txt 2016-09-26 22:16:52.000000000 +0000
++++ sundials-2.7.0/src/arkode/fcmix/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
+@@ -70,7 +70,7 @@
+ PROPERTIES OUTPUT_NAME sundials_farkode CLEAN_DIRECT_OUTPUT 1)
+
+ # Install the FARKODE library
+-INSTALL(TARGETS sundials_farkode_static DESTINATION lib)
++INSTALL(TARGETS sundials_farkode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ #
+ MESSAGE(STATUS "Added ARKODE FCMIX module")
+diff -Nur sundials-2.7.0.orig/src/cvode/CMakeLists.txt sundials-2.7.0/src/cvode/CMakeLists.txt
+--- sundials-2.7.0.orig/src/cvode/CMakeLists.txt 2016-09-26 22:17:07.000000000 +0000
++++ sundials-2.7.0/src/cvode/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
+@@ -134,7 +134,7 @@
+ PROPERTIES OUTPUT_NAME sundials_cvode CLEAN_DIRECT_OUTPUT 1)
+
+ # Install the CVODE library
+- INSTALL(TARGETS sundials_cvode_static DESTINATION lib)
++ INSTALL(TARGETS sundials_cvode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ ENDIF(BUILD_STATIC_LIBS)
+
+@@ -153,8 +153,10 @@
+ SET_TARGET_PROPERTIES(sundials_cvode_shared
+ PROPERTIES VERSION ${cvodelib_VERSION} SOVERSION ${cvodelib_SOVERSION})
+
++ TARGET_LINK_LIBRARIES(sundials_cvode_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
++
+ # Install the CVODE library
+- INSTALL(TARGETS sundials_cvode_shared DESTINATION lib)
++ INSTALL(TARGETS sundials_cvode_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ ENDIF(BUILD_SHARED_LIBS)
+
+diff -Nur sundials-2.7.0.orig/src/cvode/fcmix/CMakeLists.txt sundials-2.7.0/src/cvode/fcmix/CMakeLists.txt
+--- sundials-2.7.0.orig/src/cvode/fcmix/CMakeLists.txt 2016-09-26 22:17:07.000000000 +0000
++++ sundials-2.7.0/src/cvode/fcmix/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
+@@ -57,7 +57,7 @@
+ PROPERTIES OUTPUT_NAME sundials_fcvode CLEAN_DIRECT_OUTPUT 1)
+
+ # Install the FCVODE library
+-INSTALL(TARGETS sundials_fcvode_static DESTINATION lib)
++INSTALL(TARGETS sundials_fcvode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ #
+ MESSAGE(STATUS "Added CVODE FCMIX module")
+diff -Nur sundials-2.7.0.orig/src/cvodes/CMakeLists.txt sundials-2.7.0/src/cvodes/CMakeLists.txt
+--- sundials-2.7.0.orig/src/cvodes/CMakeLists.txt 2016-09-26 22:17:15.000000000 +0000
++++ sundials-2.7.0/src/cvodes/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
+@@ -121,7 +121,7 @@
+ PROPERTIES OUTPUT_NAME sundials_cvodes CLEAN_DIRECT_OUTPUT 1)
+
+ # Install the CVODES library
+- INSTALL(TARGETS sundials_cvodes_static DESTINATION lib)
++ INSTALL(TARGETS sundials_cvodes_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ ENDIF(BUILD_STATIC_LIBS)
+
+@@ -140,8 +140,9 @@
+ SET_TARGET_PROPERTIES(sundials_cvodes_shared
+ PROPERTIES VERSION ${cvodeslib_VERSION} SOVERSION ${cvodeslib_SOVERSION})
+
++ TARGET_LINK_LIBRARIES(sundials_cvodes_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
+ # Install the CVODES library
+- INSTALL(TARGETS sundials_cvodes_shared DESTINATION lib)
++ INSTALL(TARGETS sundials_cvodes_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ ENDIF(BUILD_SHARED_LIBS)
+
+diff -Nur sundials-2.7.0.orig/src/ida/CMakeLists.txt sundials-2.7.0/src/ida/CMakeLists.txt
+--- sundials-2.7.0.orig/src/ida/CMakeLists.txt 2016-09-26 22:17:26.000000000 +0000
++++ sundials-2.7.0/src/ida/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
+@@ -124,7 +124,7 @@
+ PROPERTIES OUTPUT_NAME sundials_ida CLEAN_DIRECT_OUTPUT 1)
+
+ # Install the IDA library
+- INSTALL(TARGETS sundials_ida_static DESTINATION lib)
++ INSTALL(TARGETS sundials_ida_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ ENDIF(BUILD_STATIC_LIBS)
+
+@@ -143,8 +143,10 @@
+ SET_TARGET_PROPERTIES(sundials_ida_shared
+ PROPERTIES VERSION ${idalib_VERSION} SOVERSION ${idalib_SOVERSION})
+
++ TARGET_LINK_LIBRARIES(sundials_ida_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
++
+ # Install the IDA library
+- INSTALL(TARGETS sundials_ida_shared DESTINATION lib)
++ INSTALL(TARGETS sundials_ida_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ ENDIF(BUILD_SHARED_LIBS)
+
+diff -Nur sundials-2.7.0.orig/src/ida/fcmix/CMakeLists.txt sundials-2.7.0/src/ida/fcmix/CMakeLists.txt
+--- sundials-2.7.0.orig/src/ida/fcmix/CMakeLists.txt 2016-09-26 22:17:26.000000000 +0000
++++ sundials-2.7.0/src/ida/fcmix/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
+@@ -56,6 +56,6 @@
+ PROPERTIES OUTPUT_NAME sundials_fida CLEAN_DIRECT_OUTPUT 1)
+
+ # Install the FIDA library
+-INSTALL(TARGETS sundials_fida_static DESTINATION lib)
++INSTALL(TARGETS sundials_fida_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ #
+ MESSAGE(STATUS "Added IDA FCMIX module")
+diff -Nur sundials-2.7.0.orig/src/idas/CMakeLists.txt sundials-2.7.0/src/idas/CMakeLists.txt
+--- sundials-2.7.0.orig/src/idas/CMakeLists.txt 2016-09-26 22:17:32.000000000 +0000
++++ sundials-2.7.0/src/idas/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
+@@ -126,7 +126,7 @@
+ PROPERTIES OUTPUT_NAME sundials_idas CLEAN_DIRECT_OUTPUT 1)
+
+ # Install the IDA library
+- INSTALL(TARGETS sundials_idas_static DESTINATION lib)
++ INSTALL(TARGETS sundials_idas_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ ENDIF(BUILD_STATIC_LIBS)
+
+@@ -145,8 +145,10 @@
+ SET_TARGET_PROPERTIES(sundials_idas_shared
+ PROPERTIES VERSION ${idaslib_VERSION} SOVERSION ${idaslib_SOVERSION})
+
++ TARGET_LINK_LIBRARIES(sundials_idas_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
++
+ # Install the IDAS library
+- INSTALL(TARGETS sundials_idas_shared DESTINATION lib)
++ INSTALL(TARGETS sundials_idas_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ ENDIF(BUILD_SHARED_LIBS)
+
+diff -Nur sundials-2.7.0.orig/src/kinsol/CMakeLists.txt sundials-2.7.0/src/kinsol/CMakeLists.txt
+--- sundials-2.7.0.orig/src/kinsol/CMakeLists.txt 2016-09-26 22:17:39.000000000 +0000
++++ sundials-2.7.0/src/kinsol/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
+@@ -134,7 +134,7 @@
+ PROPERTIES OUTPUT_NAME sundials_kinsol CLEAN_DIRECT_OUTPUT 1)
+
+ # Install the KINSOL library
+- INSTALL(TARGETS sundials_kinsol_static DESTINATION lib)
++ INSTALL(TARGETS sundials_kinsol_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ ENDIF(BUILD_STATIC_LIBS)
+
+@@ -153,8 +153,10 @@
+ SET_TARGET_PROPERTIES(sundials_kinsol_shared
+ PROPERTIES VERSION ${kinsollib_VERSION} SOVERSION ${kinsollib_SOVERSION})
+
++ TARGET_LINK_LIBRARIES(sundials_kinsol_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
++
+ # Install the KINSOL library
+- INSTALL(TARGETS sundials_kinsol_shared DESTINATION lib)
++ INSTALL(TARGETS sundials_kinsol_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ ENDIF(BUILD_SHARED_LIBS)
+
+diff -Nur sundials-2.7.0.orig/src/kinsol/fcmix/CMakeLists.txt sundials-2.7.0/src/kinsol/fcmix/CMakeLists.txt
+--- sundials-2.7.0.orig/src/kinsol/fcmix/CMakeLists.txt 2016-09-26 22:17:39.000000000 +0000
++++ sundials-2.7.0/src/kinsol/fcmix/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
+@@ -54,7 +54,7 @@
+ PROPERTIES OUTPUT_NAME sundials_fkinsol CLEAN_DIRECT_OUTPUT 1)
+
+ # Install the FKINSOL library
+-INSTALL(TARGETS sundials_fkinsol_static DESTINATION lib)
++INSTALL(TARGETS sundials_fkinsol_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ #
+ MESSAGE(STATUS "Added KINSOL FCMIX module")
+diff -Nur sundials-2.7.0.orig/src/nvec_openmp/CMakeLists.txt sundials-2.7.0/src/nvec_openmp/CMakeLists.txt
+--- sundials-2.7.0.orig/src/nvec_openmp/CMakeLists.txt 2016-09-26 22:16:50.000000000 +0000
++++ sundials-2.7.0/src/nvec_openmp/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
+@@ -51,7 +51,7 @@
+ ADD_LIBRARY(sundials_nvecopenmp_static STATIC ${nvecopenmp_SOURCES} ${shared_SOURCES})
+ SET_TARGET_PROPERTIES(sundials_nvecopenmp_static
+ PROPERTIES OUTPUT_NAME sundials_nvecopenmp CLEAN_DIRECT_OUTPUT 1)
+- INSTALL(TARGETS sundials_nvecopenmp_static DESTINATION lib)
++ INSTALL(TARGETS sundials_nvecopenmp_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_STATIC_LIBS)
+
+ # Rules for building and installing the shared library:
+@@ -65,7 +65,8 @@
+ PROPERTIES OUTPUT_NAME sundials_nvecopenmp CLEAN_DIRECT_OUTPUT 1)
+ SET_TARGET_PROPERTIES(sundials_nvecopenmp_shared
+ PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+- INSTALL(TARGETS sundials_nvecopenmp_shared DESTINATION lib)
++ TARGET_LINK_LIBRARIES(sundials_nvecopenmp_shared -lm)
++ INSTALL(TARGETS sundials_nvecopenmp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+
+ # Install the NVECOPENMP header files
+@@ -78,7 +79,7 @@
+ ADD_LIBRARY(sundials_fnvecopenmp_static STATIC ${fnvecopenmp_SOURCES})
+ SET_TARGET_PROPERTIES(sundials_fnvecopenmp_static
+ PROPERTIES OUTPUT_NAME sundials_fnvecopenmp CLEAN_DIRECT_OUTPUT 1)
+- INSTALL(TARGETS sundials_fnvecopenmp_static DESTINATION lib)
++ INSTALL(TARGETS sundials_fnvecopenmp_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_STATIC_LIBS)
+ IF(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(sundials_fnvecopenmp_shared ${fnvecopenmp_SOURCES})
+@@ -86,7 +87,8 @@
+ PROPERTIES OUTPUT_NAME sundials_fnvecopenmp CLEAN_DIRECT_OUTPUT 1)
+ SET_TARGET_PROPERTIES(sundials_fnvecopenmp_shared
+ PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+- INSTALL(TARGETS sundials_fnvecopenmp_shared DESTINATION lib)
++ TARGET_LINK_LIBRARIES(sundials_fnvecopenmp_shared -lm)
++ INSTALL(TARGETS sundials_fnvecopenmp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+
+diff -Nur sundials-2.7.0.orig/src/nvec_par/CMakeLists.txt sundials-2.7.0/src/nvec_par/CMakeLists.txt
+--- sundials-2.7.0.orig/src/nvec_par/CMakeLists.txt 2016-09-26 22:16:50.000000000 +0000
++++ sundials-2.7.0/src/nvec_par/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
+@@ -52,7 +52,7 @@
+ ADD_LIBRARY(sundials_nvecparallel_static STATIC ${nvecparallel_SOURCES} ${shared_SOURCES})
+ SET_TARGET_PROPERTIES(sundials_nvecparallel_static
+ PROPERTIES OUTPUT_NAME sundials_nvecparallel CLEAN_DIRECT_OUTPUT 1)
+- INSTALL(TARGETS sundials_nvecparallel_static DESTINATION lib)
++ INSTALL(TARGETS sundials_nvecparallel_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_STATIC_LIBS)
+
+ # Rules for building and installing the shared library:
+@@ -66,7 +66,8 @@
+ PROPERTIES OUTPUT_NAME sundials_nvecparallel CLEAN_DIRECT_OUTPUT 1)
+ SET_TARGET_PROPERTIES(sundials_nvecparallel_shared
+ PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+- INSTALL(TARGETS sundials_nvecparallel_shared DESTINATION lib)
++ TARGET_LINK_LIBRARIES(sundials_nvecparallel_shared -lm)
++ INSTALL(TARGETS sundials_nvecparallel_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+
+ # Install the NVECPARALLEL header files
+@@ -79,7 +80,7 @@
+ ADD_LIBRARY(sundials_fnvecparallel_static STATIC ${fnvecparallel_SOURCES})
+ SET_TARGET_PROPERTIES(sundials_fnvecparallel_static
+ PROPERTIES OUTPUT_NAME sundials_fnvecparallel CLEAN_DIRECT_OUTPUT 1)
+- INSTALL(TARGETS sundials_fnvecparallel_static DESTINATION lib)
++ INSTALL(TARGETS sundials_fnvecparallel_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_STATIC_LIBS)
+ IF(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(sundials_fnvecparallel_shared SHARED ${fnvecparallel_SOURCES})
+@@ -87,7 +88,7 @@
+ PROPERTIES OUTPUT_NAME sundials_fnvecparallel CLEAN_DIRECT_OUTPUT 1)
+ SET_TARGET_PROPERTIES(sundials_fnvecparallel_shared
+ PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+- INSTALL(TARGETS sundials_fnvecparallel_shared DESTINATION lib)
++ INSTALL(TARGETS sundials_fnvecparallel_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ ENDIF(FCMIX_ENABLE AND MPIF_FOUND)
+ #
+diff -Nur sundials-2.7.0.orig/src/nvec_parhyp/CMakeLists.txt sundials-2.7.0/src/nvec_parhyp/CMakeLists.txt
+--- sundials-2.7.0.orig/src/nvec_parhyp/CMakeLists.txt 2016-09-26 22:16:50.000000000 +0000
++++ sundials-2.7.0/src/nvec_parhyp/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
+@@ -53,7 +53,7 @@
+ ADD_LIBRARY(sundials_nvecparhyp_static STATIC ${nvecparhyp_SOURCES} ${shared_SOURCES})
+ SET_TARGET_PROPERTIES(sundials_nvecparhyp_static
+ PROPERTIES OUTPUT_NAME sundials_nvecparhyp CLEAN_DIRECT_OUTPUT 1)
+- INSTALL(TARGETS sundials_nvecparhyp_static DESTINATION lib)
++ INSTALL(TARGETS sundials_nvecparhyp_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_STATIC_LIBS)
+
+ # Rules for building and installing the shared library:
+@@ -67,7 +67,7 @@
+ PROPERTIES OUTPUT_NAME sundials_nvecparhyp CLEAN_DIRECT_OUTPUT 1)
+ SET_TARGET_PROPERTIES(sundials_nvecparhyp_shared
+ PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+- INSTALL(TARGETS sundials_nvecparhyp_shared DESTINATION lib)
++ INSTALL(TARGETS sundials_nvecparhyp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+
+ # Install the NVECPARHYP header files
+diff -Nur sundials-2.7.0.orig/src/nvec_petsc/CMakeLists.txt sundials-2.7.0/src/nvec_petsc/CMakeLists.txt
+--- sundials-2.7.0.orig/src/nvec_petsc/CMakeLists.txt 2016-09-26 22:16:50.000000000 +0000
++++ sundials-2.7.0/src/nvec_petsc/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
+@@ -53,7 +53,7 @@
+ ADD_LIBRARY(sundials_nvecpetsc_static STATIC ${nvecpetsc_SOURCES} ${shared_SOURCES})
+ SET_TARGET_PROPERTIES(sundials_nvecpetsc_static
+ PROPERTIES OUTPUT_NAME sundials_nvecpetsc CLEAN_DIRECT_OUTPUT 1)
+- INSTALL(TARGETS sundials_nvecpetsc_static DESTINATION lib)
++ INSTALL(TARGETS sundials_nvecpetsc_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_STATIC_LIBS)
+
+ # Rules for building and installing the shared library:
+@@ -67,7 +67,7 @@
+ PROPERTIES OUTPUT_NAME sundials_nvecpetsc CLEAN_DIRECT_OUTPUT 1)
+ SET_TARGET_PROPERTIES(sundials_nvecpetsc_shared
+ PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+- INSTALL(TARGETS sundials_nvecpetsc_shared DESTINATION lib)
++ INSTALL(TARGETS sundials_nvecpetsc_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+
+ # Install the NVECPARHYP header files
+diff -Nur sundials-2.7.0.orig/src/nvec_pthreads/CMakeLists.txt sundials-2.7.0/src/nvec_pthreads/CMakeLists.txt
+--- sundials-2.7.0.orig/src/nvec_pthreads/CMakeLists.txt 2016-09-26 22:16:50.000000000 +0000
++++ sundials-2.7.0/src/nvec_pthreads/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
+@@ -44,7 +44,7 @@
+ ADD_LIBRARY(sundials_nvecpthreads_static STATIC ${nvecpthreads_SOURCES} ${shared_SOURCES})
+ SET_TARGET_PROPERTIES(sundials_nvecpthreads_static
+ PROPERTIES OUTPUT_NAME sundials_nvecpthreads CLEAN_DIRECT_OUTPUT 1)
+- INSTALL(TARGETS sundials_nvecpthreads_static DESTINATION lib)
++ INSTALL(TARGETS sundials_nvecpthreads_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_STATIC_LIBS)
+
+ # Rules for building and installing the shared library:
+@@ -58,7 +58,8 @@
+ PROPERTIES OUTPUT_NAME sundials_nvecpthreads CLEAN_DIRECT_OUTPUT 1)
+ SET_TARGET_PROPERTIES(sundials_nvecpthreads_shared
+ PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+- INSTALL(TARGETS sundials_nvecpthreads_shared DESTINATION lib)
++ TARGET_LINK_LIBRARIES(sundials_nvecpthreads_shared -lm -lpthread)
++ INSTALL(TARGETS sundials_nvecpthreads_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+
+ # Install the NVECPTHREADS header files
+@@ -71,7 +72,7 @@
+ ADD_LIBRARY(sundials_fnvecpthreads_static STATIC ${fnvecpthreads_SOURCES})
+ SET_TARGET_PROPERTIES(sundials_fnvecpthreads_static
+ PROPERTIES OUTPUT_NAME sundials_fnvecpthreads CLEAN_DIRECT_OUTPUT 1)
+- INSTALL(TARGETS sundials_fnvecpthreads_static DESTINATION lib)
++ INSTALL(TARGETS sundials_fnvecpthreads_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_STATIC_LIBS)
+ IF(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(sundials_fnvecpthreads_shared ${fnvecpthreads_SOURCES})
+@@ -79,7 +80,8 @@
+ PROPERTIES OUTPUT_NAME sundials_fnvecpthreads CLEAN_DIRECT_OUTPUT 1)
+ SET_TARGET_PROPERTIES(sundials_fnvecpthreads_shared
+ PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+- INSTALL(TARGETS sundials_fnvecpthreads_shared DESTINATION lib)
++ TARGET_LINK_LIBRARIES(sundials_fnvecpthreads_shared -lm -lpthread)
++ INSTALL(TARGETS sundials_fnvecpthreads_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+
+diff -Nur sundials-2.7.0.orig/src/nvec_ser/CMakeLists.txt sundials-2.7.0/src/nvec_ser/CMakeLists.txt
+--- sundials-2.7.0.orig/src/nvec_ser/CMakeLists.txt 2016-09-26 22:16:49.000000000 +0000
++++ sundials-2.7.0/src/nvec_ser/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
+@@ -44,7 +44,7 @@
+ ADD_LIBRARY(sundials_nvecserial_static STATIC ${nvecserial_SOURCES} ${shared_SOURCES})
+ SET_TARGET_PROPERTIES(sundials_nvecserial_static
+ PROPERTIES OUTPUT_NAME sundials_nvecserial CLEAN_DIRECT_OUTPUT 1)
+- INSTALL(TARGETS sundials_nvecserial_static DESTINATION lib)
++ INSTALL(TARGETS sundials_nvecserial_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_STATIC_LIBS)
+
+ # Rules for building and installing the shared library:
+@@ -58,7 +58,8 @@
+ PROPERTIES OUTPUT_NAME sundials_nvecserial CLEAN_DIRECT_OUTPUT 1)
+ SET_TARGET_PROPERTIES(sundials_nvecserial_shared
+ PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+- INSTALL(TARGETS sundials_nvecserial_shared DESTINATION lib)
++ TARGET_LINK_LIBRARIES(sundials_nvecserial_shared -lm)
++ INSTALL(TARGETS sundials_nvecserial_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+
+ # Install the NVECSERIAL header files
+@@ -71,7 +72,7 @@
+ ADD_LIBRARY(sundials_fnvecserial_static STATIC ${fnvecserial_SOURCES})
+ SET_TARGET_PROPERTIES(sundials_fnvecserial_static
+ PROPERTIES OUTPUT_NAME sundials_fnvecserial CLEAN_DIRECT_OUTPUT 1)
+- INSTALL(TARGETS sundials_fnvecserial_static DESTINATION lib)
++ INSTALL(TARGETS sundials_fnvecserial_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_STATIC_LIBS)
+ IF(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(sundials_fnvecserial_shared ${fnvecserial_SOURCES})
+@@ -79,7 +80,8 @@
+ PROPERTIES OUTPUT_NAME sundials_fnvecserial CLEAN_DIRECT_OUTPUT 1)
+ SET_TARGET_PROPERTIES(sundials_fnvecserial_shared
+ PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+- INSTALL(TARGETS sundials_fnvecserial_shared DESTINATION lib)
++ TARGET_LINK_LIBRARIES(sundials_fnvecserial_shared -lm)
++ INSTALL(TARGETS sundials_fnvecserial_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+
diff --git a/sci-libs/sundials/metadata.xml b/sci-libs/sundials/metadata.xml
new file mode 100644
index 00000000..b4735cc
--- /dev/null
+++ b/sci-libs/sundials/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Scientific Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ SUite of Nonlinear and DIfferential/ALgebraic equation Solvers was
+ implemented with the goal of providing robust time integrators and
+ nonlinear solvers that can easily be incorporated into existing
+ simulation codes. The primary design goals were to require minimal
+ information from the user, allow users to easily supply their own
+ data structures underneath the solvers, and allow for easy
+ incorporation of user-supplied linear solvers and preconditioners.
+ </longdescription>
+ <use>
+ <flag name="hypre">Build with <pkg>sci-libs/hypre</pkg> conditioners</flag>
+ <flag name="sparse">Enable support for <pkg>sci-libs/klu</pkg> sparse solver</flag>
+ <flag name="superlumt">Build with <pkg>sci-libs/superlu_mt</pkg></flag>
+ </use>
+</pkgmetadata>
diff --git a/sci-libs/sundials/sundials-2.7.0.ebuild b/sci-libs/sundials/sundials-2.7.0.ebuild
new file mode 100644
index 00000000..d42c789
--- /dev/null
+++ b/sci-libs/sundials/sundials-2.7.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=90
+
+inherit cmake-utils toolchain-funcs fortran-2 versionator
+
+DESCRIPTION="Suite of nonlinear solvers"
+HOMEPAGE="http://computation.llnl.gov/projects/sundials"
+SRC_URI="http://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(get_major_version)"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
+REQUIRED_USE="hypre? ( mpi )"
+
+RDEPEND="
+ lapack? ( virtual/lapack )
+ mpi? ( virtual/mpi sci-libs/hypre:= )
+ sparse? ( sci-libs/klu:= )
+ superlumt? ( sci-libs/superlu_mt:= )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-underlinking-libdir.patch )
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+ ewarn "OpenMP is not available in your current selected gcc"
+ die "need openmp capable gcc"
+ fi
+}
+
+src_configure() {
+ mycmakeargs+=(
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_STATIC_LIBS="$(usex static-libs)"
+ -DCXX_ENABLE="$(usex cxx)"
+ -DFCMIX_ENABLE="$(usex fortran)"
+ -DF90_ENABLE="$(usex fortran)"
+ -DHYPRE_ENABLE="$(usex hypre)"
+ -DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
+ -DHYPRE_LIBRARY="HYPRE"
+ -DKLU_ENABLE="$(usex sparse)"
+ -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
+ -DLAPACK_ENABLE="$(usex lapack)"
+ -DMPI_ENABLE="$(usex mpi)"
+ -DOPENMP_ENABLE="$(usex openmp)"
+ -DPTHREAD_ENABLE="$(usex threads)"
+ -DSUPERLUMT_ENABLE="$(usex superlumt)"
+ -DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
+ -DSUPERLUMT_LIBRARY="superlu_mt"
+ -DEXAMPLES_ENABLE="$(usex examples)"
+ -DEXAMPLES_INSTALL=ON
+ -DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+ -DUSE_GENERIC_MATH=ON
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ use doc && dodoc doc/*/*.pdf
+ cd src
+ for r in */README; do
+ newdoc ${r} README-${r%/*}
+ done
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/sundials/files/, sci-libs/sundials/
@ 2019-07-15 21:35 Matthias Maier
0 siblings, 0 replies; 11+ messages in thread
From: Matthias Maier @ 2019-07-15 21:35 UTC (permalink / raw
To: gentoo-commits
commit: da3df85e7e7ca8d26714934191aaa9fbbfbd5ea5
Author: band-a-prend <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sat Jun 22 21:58:50 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 21:33:30 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da3df85e
sci-libs/sundials: 4.1.0 version bump
Signed-off-by: Sergey Torokhov <torokhov_s_a <AT> mail.ru>
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/sundials/Manifest | 1 +
.../sundials-4.1.0-fix-license-install-path.patch | 11 ++++
sci-libs/sundials/sundials-4.1.0.ebuild | 72 ++++++++++++++++++++++
3 files changed, 84 insertions(+)
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index 45fd18330a5..c349ff6661c 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -4,3 +4,4 @@ DIST sundials-3.1.0.tar.gz 13033516 BLAKE2B 41294c1022ab09db6fbfa0d41c169d2ead34
DIST sundials-3.1.2.tar.gz 18212893 BLAKE2B cee897f59920d6530553e4005b043fe615bf86ed6cc4ecb829afc25ea46c1a37cefd5a05584bd763af29689980d7bb03442ad22c4b83dd3af2406e786540652a SHA512 b65989998b440b2b5c5d000f4b86d8bcbf03215fcee4e348cd4b8ff935ea3471a3593ab8bd0e7d5f8ba519b5a1285cc93d41ec622d0b51592d7593c7579af082
DIST sundials-3.2.1.tar.gz 14958699 BLAKE2B ecc4b454ec589e9177acc9375e1db370ad6281f8d29580d9558ad3146dbbaab52794013e9cb56ad83f7309dbd3084a1ccaf6972c6b1468cefcc86bf30d3a460c SHA512 1f3e4b12f368e4f50c38b970c012f1702e339319ee0a858661bdf83e5739bb5b8a36f98b82e2ef76d1ce8a473123046347ee1b44f3cb685509823864f0af1384
DIST sundials-4.0.2.tar.gz 17183377 BLAKE2B e322a978186f41d84a936faa55962ef6794bf99d6c6a108bfa2bd5615f27f32f7ab6ca4989802fa052d3132b53dca3069b7e4ec9941f95efb92de7bf0792dd88 SHA512 6d0a6fc49c695e70593da71892f0906585dee9c94899bb6b8c9a56c85f345809565166a62544647fdac411d22e37276b9b1bb78ba9be46eaeb28dcd3f6162ef5
+DIST sundials-4.1.0.tar.gz 17221960 BLAKE2B 598c7adc9e37fcfb1f44a3235f58af489ad907d053cb67ee0d3b076076621958374eb847e48318ddf7ced85a7601c5330ac640c7abe8723aaee7d650e3298b8d SHA512 1922dca3f0b8869098670aede802e48abec39607c96304e4efd9b03d195b16920175846fce10641aeebc48c216bda73c8691139dce57ffa7731a6bc8194b81b0
diff --git a/sci-libs/sundials/files/sundials-4.1.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-4.1.0-fix-license-install-path.patch
new file mode 100644
index 00000000000..eb7fdbbec53
--- /dev/null
+++ b/sci-libs/sundials/files/sundials-4.1.0-fix-license-install-path.patch
@@ -0,0 +1,11 @@
+diff -Nur old/CMakeLists.txt new/CMakeLists.txt
+--- old/CMakeLists.txt 2019-02-12 21:50:51.000000000 +0300
++++ new/CMakeLists.txt 2019-06-23 00:39:23.000000000 +0300
+@@ -1172,6 +1172,6 @@
+ )
+ INSTALL(
+ FILES ${PROJECT_SOURCE_DIR}/NOTICE
+- DESTINATION include/sundials
++ DESTINATION share/doc/sundials-4.1.0)
+ )
+
diff --git a/sci-libs/sundials/sundials-4.1.0.ebuild b/sci-libs/sundials/sundials-4.1.0.ebuild
new file mode 100644
index 00000000000..649b2f4f708
--- /dev/null
+++ b/sci-libs/sundials/sundials-4.1.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=90
+
+inherit cmake-utils eapi7-ver toolchain-funcs fortran-2
+
+DESCRIPTION="Suite of nonlinear solvers"
+HOMEPAGE="https://computation.llnl.gov/projects/sundials"
+SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
+REQUIRED_USE="hypre? ( mpi )"
+
+RDEPEND="
+ lapack? ( virtual/lapack )
+ mpi? ( virtual/mpi sci-libs/hypre:= )
+ sparse? ( sci-libs/klu:= )
+ superlumt? ( sci-libs/superlu_mt:= )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+ ewarn "OpenMP is not available in your current selected gcc"
+ die "need openmp capable gcc"
+ fi
+}
+
+src_configure() {
+ mycmakeargs+=(
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_STATIC_LIBS="$(usex static-libs)"
+ -DCXX_ENABLE="$(usex cxx)"
+ -DFCMIX_ENABLE="$(usex fortran)"
+ -DF90_ENABLE="$(usex fortran)"
+ -DHYPRE_ENABLE="$(usex hypre)"
+ -DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
+ -DKLU_ENABLE="$(usex sparse)"
+ -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
+ -DLAPACK_ENABLE="$(usex lapack)"
+ -DMPI_ENABLE="$(usex mpi)"
+ -DOPENMP_ENABLE="$(usex openmp)"
+ -DPTHREAD_ENABLE="$(usex threads)"
+ -DSUPERLUMT_ENABLE="$(usex superlumt)"
+ -DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
+ -DSUPERLUMT_LIBRARY="superlu_mt"
+ -DEXAMPLES_ENABLE="$(usex examples)"
+ -DEXAMPLES_INSTALL=ON
+ -DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+ -DUSE_GENERIC_MATH=ON
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ use doc && dodoc doc/*/*.pdf
+ cd src
+ for r in */README; do
+ newdoc ${r} README-${r%/*}
+ done
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/sundials/files/, sci-libs/sundials/
@ 2019-07-15 21:35 Matthias Maier
0 siblings, 0 replies; 11+ messages in thread
From: Matthias Maier @ 2019-07-15 21:35 UTC (permalink / raw
To: gentoo-commits
commit: d6238bfb5ec5431659b1220ae92b896cefdd8cec
Author: band-a-prend <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sat Jun 22 21:57:38 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 21:33:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6238bfb
sci-libs/sundials: 4.0.2 version bump
Signed-off-by: Sergey Torokhov <torokhov_s_a <AT> mail.ru>
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/sundials/Manifest | 1 +
.../sundials-4.0.2-fix-license-install-path.patch | 11 ++++
sci-libs/sundials/sundials-4.0.2.ebuild | 72 ++++++++++++++++++++++
3 files changed, 84 insertions(+)
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index b2b2f1f4626..45fd18330a5 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -3,3 +3,4 @@ DIST sundials-3.0.0.tar.gz 12996039 BLAKE2B 0557190f6f7550bd4d7d3df10f727c6f235f
DIST sundials-3.1.0.tar.gz 13033516 BLAKE2B 41294c1022ab09db6fbfa0d41c169d2ead3483693653a9c0cc26fdffec61918fed5e93241f64f9bfdc6ff22812fb846f3ea8deecd82c28d179dded85ec2c69ba SHA512 288427e00f58c512583cc14d81385e82b0fdeaa4e9adca588a108ad0752341b7be62c9fa2740924ec733e3e0d5794f305dc582fc72e244e675e5ea00ac0d08ca
DIST sundials-3.1.2.tar.gz 18212893 BLAKE2B cee897f59920d6530553e4005b043fe615bf86ed6cc4ecb829afc25ea46c1a37cefd5a05584bd763af29689980d7bb03442ad22c4b83dd3af2406e786540652a SHA512 b65989998b440b2b5c5d000f4b86d8bcbf03215fcee4e348cd4b8ff935ea3471a3593ab8bd0e7d5f8ba519b5a1285cc93d41ec622d0b51592d7593c7579af082
DIST sundials-3.2.1.tar.gz 14958699 BLAKE2B ecc4b454ec589e9177acc9375e1db370ad6281f8d29580d9558ad3146dbbaab52794013e9cb56ad83f7309dbd3084a1ccaf6972c6b1468cefcc86bf30d3a460c SHA512 1f3e4b12f368e4f50c38b970c012f1702e339319ee0a858661bdf83e5739bb5b8a36f98b82e2ef76d1ce8a473123046347ee1b44f3cb685509823864f0af1384
+DIST sundials-4.0.2.tar.gz 17183377 BLAKE2B e322a978186f41d84a936faa55962ef6794bf99d6c6a108bfa2bd5615f27f32f7ab6ca4989802fa052d3132b53dca3069b7e4ec9941f95efb92de7bf0792dd88 SHA512 6d0a6fc49c695e70593da71892f0906585dee9c94899bb6b8c9a56c85f345809565166a62544647fdac411d22e37276b9b1bb78ba9be46eaeb28dcd3f6162ef5
diff --git a/sci-libs/sundials/files/sundials-4.0.2-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-4.0.2-fix-license-install-path.patch
new file mode 100644
index 00000000000..3e2b65d49dd
--- /dev/null
+++ b/sci-libs/sundials/files/sundials-4.0.2-fix-license-install-path.patch
@@ -0,0 +1,11 @@
+diff -Nur old/CMakeLists.txt new/CMakeLists.txt
+--- old/CMakeLists.txt 2019-01-23 01:05:44.000000000 +0300
++++ new/CMakeLists.txt 2019-06-23 00:35:57.000000000 +0300
+@@ -1214,6 +1214,6 @@
+ )
+ INSTALL(
+ FILES ${PROJECT_SOURCE_DIR}/NOTICE
+- DESTINATION include/sundials
++ DESTINATION share/doc/sundials-4.0.2)
+ )
+
diff --git a/sci-libs/sundials/sundials-4.0.2.ebuild b/sci-libs/sundials/sundials-4.0.2.ebuild
new file mode 100644
index 00000000000..649b2f4f708
--- /dev/null
+++ b/sci-libs/sundials/sundials-4.0.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=90
+
+inherit cmake-utils eapi7-ver toolchain-funcs fortran-2
+
+DESCRIPTION="Suite of nonlinear solvers"
+HOMEPAGE="https://computation.llnl.gov/projects/sundials"
+SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
+REQUIRED_USE="hypre? ( mpi )"
+
+RDEPEND="
+ lapack? ( virtual/lapack )
+ mpi? ( virtual/mpi sci-libs/hypre:= )
+ sparse? ( sci-libs/klu:= )
+ superlumt? ( sci-libs/superlu_mt:= )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+ ewarn "OpenMP is not available in your current selected gcc"
+ die "need openmp capable gcc"
+ fi
+}
+
+src_configure() {
+ mycmakeargs+=(
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_STATIC_LIBS="$(usex static-libs)"
+ -DCXX_ENABLE="$(usex cxx)"
+ -DFCMIX_ENABLE="$(usex fortran)"
+ -DF90_ENABLE="$(usex fortran)"
+ -DHYPRE_ENABLE="$(usex hypre)"
+ -DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
+ -DKLU_ENABLE="$(usex sparse)"
+ -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
+ -DLAPACK_ENABLE="$(usex lapack)"
+ -DMPI_ENABLE="$(usex mpi)"
+ -DOPENMP_ENABLE="$(usex openmp)"
+ -DPTHREAD_ENABLE="$(usex threads)"
+ -DSUPERLUMT_ENABLE="$(usex superlumt)"
+ -DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
+ -DSUPERLUMT_LIBRARY="superlu_mt"
+ -DEXAMPLES_ENABLE="$(usex examples)"
+ -DEXAMPLES_INSTALL=ON
+ -DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+ -DUSE_GENERIC_MATH=ON
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ use doc && dodoc doc/*/*.pdf
+ cd src
+ for r in */README; do
+ newdoc ${r} README-${r%/*}
+ done
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/sundials/files/, sci-libs/sundials/
@ 2019-07-30 15:12 Matthias Maier
0 siblings, 0 replies; 11+ messages in thread
From: Matthias Maier @ 2019-07-30 15:12 UTC (permalink / raw
To: gentoo-commits
commit: f7c64f5c9186cd40742ccfb55f5e492be241c2f3
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 15:11:20 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 15:12:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7c64f5c
sci-libs/sundials: drop old
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/sundials/Manifest | 4 -
.../files/sundials-2.7.0-underlinking-libdir.patch | 395 ---------------------
.../sundials-3.1.2-fix-license-install-path.patch | 9 -
sci-libs/sundials/sundials-2.7.0.ebuild | 73 ----
sci-libs/sundials/sundials-3.0.0.ebuild | 79 -----
sci-libs/sundials/sundials-3.1.0.ebuild | 78 ----
sci-libs/sundials/sundials-3.1.2.ebuild | 78 ----
7 files changed, 716 deletions(-)
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index c349ff6661c..e3e6893d43f 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -1,7 +1,3 @@
-DIST sundials-2.7.0.tar.gz 12258093 BLAKE2B 331fcf255f2bb8bcc798818b05db114feda7aacb6585177a836f17a9b58477f504099b4a33c7d71cab6e70eeb6fe47a76d101c08aa6219ee6fbac630524d5928 SHA512 c86c167538065a4109b36ae7c8f60f3d92184133cfa661b5acfccee052c38f40be865412a1746bb57907b61602c212c0f15e1e30ef29e8a49db6d46a75a28e69
-DIST sundials-3.0.0.tar.gz 12996039 BLAKE2B 0557190f6f7550bd4d7d3df10f727c6f235ff4917f2cfd35ca77785037edc43236a82383664f6fe1579bb5b07a148875b82b22f5a9e4f5f2a0607838e8a3b286 SHA512 3c86c7f27e64c2e6732546b0b1e87ea092502e361cae09b3b7eb29795c978edf494e17be13b78541dc91cc0709d928006bd0fc62ea968f2b621efa51856cdd60
-DIST sundials-3.1.0.tar.gz 13033516 BLAKE2B 41294c1022ab09db6fbfa0d41c169d2ead3483693653a9c0cc26fdffec61918fed5e93241f64f9bfdc6ff22812fb846f3ea8deecd82c28d179dded85ec2c69ba SHA512 288427e00f58c512583cc14d81385e82b0fdeaa4e9adca588a108ad0752341b7be62c9fa2740924ec733e3e0d5794f305dc582fc72e244e675e5ea00ac0d08ca
-DIST sundials-3.1.2.tar.gz 18212893 BLAKE2B cee897f59920d6530553e4005b043fe615bf86ed6cc4ecb829afc25ea46c1a37cefd5a05584bd763af29689980d7bb03442ad22c4b83dd3af2406e786540652a SHA512 b65989998b440b2b5c5d000f4b86d8bcbf03215fcee4e348cd4b8ff935ea3471a3593ab8bd0e7d5f8ba519b5a1285cc93d41ec622d0b51592d7593c7579af082
DIST sundials-3.2.1.tar.gz 14958699 BLAKE2B ecc4b454ec589e9177acc9375e1db370ad6281f8d29580d9558ad3146dbbaab52794013e9cb56ad83f7309dbd3084a1ccaf6972c6b1468cefcc86bf30d3a460c SHA512 1f3e4b12f368e4f50c38b970c012f1702e339319ee0a858661bdf83e5739bb5b8a36f98b82e2ef76d1ce8a473123046347ee1b44f3cb685509823864f0af1384
DIST sundials-4.0.2.tar.gz 17183377 BLAKE2B e322a978186f41d84a936faa55962ef6794bf99d6c6a108bfa2bd5615f27f32f7ab6ca4989802fa052d3132b53dca3069b7e4ec9941f95efb92de7bf0792dd88 SHA512 6d0a6fc49c695e70593da71892f0906585dee9c94899bb6b8c9a56c85f345809565166a62544647fdac411d22e37276b9b1bb78ba9be46eaeb28dcd3f6162ef5
DIST sundials-4.1.0.tar.gz 17221960 BLAKE2B 598c7adc9e37fcfb1f44a3235f58af489ad907d053cb67ee0d3b076076621958374eb847e48318ddf7ced85a7601c5330ac640c7abe8723aaee7d650e3298b8d SHA512 1922dca3f0b8869098670aede802e48abec39607c96304e4efd9b03d195b16920175846fce10641aeebc48c216bda73c8691139dce57ffa7731a6bc8194b81b0
diff --git a/sci-libs/sundials/files/sundials-2.7.0-underlinking-libdir.patch b/sci-libs/sundials/files/sundials-2.7.0-underlinking-libdir.patch
deleted file mode 100644
index db47ac3b350..00000000000
--- a/sci-libs/sundials/files/sundials-2.7.0-underlinking-libdir.patch
+++ /dev/null
@@ -1,395 +0,0 @@
-diff -Nur sundials-2.7.0.orig/src/arkode/CMakeLists.txt sundials-2.7.0/src/arkode/CMakeLists.txt
---- sundials-2.7.0.orig/src/arkode/CMakeLists.txt 2016-09-26 22:16:52.000000000 +0000
-+++ sundials-2.7.0/src/arkode/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
-@@ -127,7 +127,7 @@
- PROPERTIES OUTPUT_NAME sundials_arkode CLEAN_DIRECT_OUTPUT 1)
-
- # Install the ARKODE library
-- INSTALL(TARGETS sundials_arkode_static DESTINATION lib)
-+ INSTALL(TARGETS sundials_arkode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- ENDIF(BUILD_STATIC_LIBS)
-
-@@ -146,8 +146,10 @@
- SET_TARGET_PROPERTIES(sundials_arkode_shared
- PROPERTIES VERSION ${arkodelib_VERSION} SOVERSION ${arkodelib_SOVERSION})
-
-+ TARGET_LINK_LIBRARIES(sundials_arkode_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+
- # Install the ARKODE library
-- INSTALL(TARGETS sundials_arkode_shared DESTINATION lib)
-+ INSTALL(TARGETS sundials_arkode_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- ENDIF(BUILD_SHARED_LIBS)
-
-diff -Nur sundials-2.7.0.orig/src/arkode/fcmix/CMakeLists.txt sundials-2.7.0/src/arkode/fcmix/CMakeLists.txt
---- sundials-2.7.0.orig/src/arkode/fcmix/CMakeLists.txt 2016-09-26 22:16:52.000000000 +0000
-+++ sundials-2.7.0/src/arkode/fcmix/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
-@@ -70,7 +70,7 @@
- PROPERTIES OUTPUT_NAME sundials_farkode CLEAN_DIRECT_OUTPUT 1)
-
- # Install the FARKODE library
--INSTALL(TARGETS sundials_farkode_static DESTINATION lib)
-+INSTALL(TARGETS sundials_farkode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- #
- MESSAGE(STATUS "Added ARKODE FCMIX module")
-diff -Nur sundials-2.7.0.orig/src/cvode/CMakeLists.txt sundials-2.7.0/src/cvode/CMakeLists.txt
---- sundials-2.7.0.orig/src/cvode/CMakeLists.txt 2016-09-26 22:17:07.000000000 +0000
-+++ sundials-2.7.0/src/cvode/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
-@@ -134,7 +134,7 @@
- PROPERTIES OUTPUT_NAME sundials_cvode CLEAN_DIRECT_OUTPUT 1)
-
- # Install the CVODE library
-- INSTALL(TARGETS sundials_cvode_static DESTINATION lib)
-+ INSTALL(TARGETS sundials_cvode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- ENDIF(BUILD_STATIC_LIBS)
-
-@@ -153,8 +153,10 @@
- SET_TARGET_PROPERTIES(sundials_cvode_shared
- PROPERTIES VERSION ${cvodelib_VERSION} SOVERSION ${cvodelib_SOVERSION})
-
-+ TARGET_LINK_LIBRARIES(sundials_cvode_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+
- # Install the CVODE library
-- INSTALL(TARGETS sundials_cvode_shared DESTINATION lib)
-+ INSTALL(TARGETS sundials_cvode_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- ENDIF(BUILD_SHARED_LIBS)
-
-diff -Nur sundials-2.7.0.orig/src/cvode/fcmix/CMakeLists.txt sundials-2.7.0/src/cvode/fcmix/CMakeLists.txt
---- sundials-2.7.0.orig/src/cvode/fcmix/CMakeLists.txt 2016-09-26 22:17:07.000000000 +0000
-+++ sundials-2.7.0/src/cvode/fcmix/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
-@@ -57,7 +57,7 @@
- PROPERTIES OUTPUT_NAME sundials_fcvode CLEAN_DIRECT_OUTPUT 1)
-
- # Install the FCVODE library
--INSTALL(TARGETS sundials_fcvode_static DESTINATION lib)
-+INSTALL(TARGETS sundials_fcvode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- #
- MESSAGE(STATUS "Added CVODE FCMIX module")
-diff -Nur sundials-2.7.0.orig/src/cvodes/CMakeLists.txt sundials-2.7.0/src/cvodes/CMakeLists.txt
---- sundials-2.7.0.orig/src/cvodes/CMakeLists.txt 2016-09-26 22:17:15.000000000 +0000
-+++ sundials-2.7.0/src/cvodes/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
-@@ -121,7 +121,7 @@
- PROPERTIES OUTPUT_NAME sundials_cvodes CLEAN_DIRECT_OUTPUT 1)
-
- # Install the CVODES library
-- INSTALL(TARGETS sundials_cvodes_static DESTINATION lib)
-+ INSTALL(TARGETS sundials_cvodes_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- ENDIF(BUILD_STATIC_LIBS)
-
-@@ -140,8 +140,9 @@
- SET_TARGET_PROPERTIES(sundials_cvodes_shared
- PROPERTIES VERSION ${cvodeslib_VERSION} SOVERSION ${cvodeslib_SOVERSION})
-
-+ TARGET_LINK_LIBRARIES(sundials_cvodes_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
- # Install the CVODES library
-- INSTALL(TARGETS sundials_cvodes_shared DESTINATION lib)
-+ INSTALL(TARGETS sundials_cvodes_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- ENDIF(BUILD_SHARED_LIBS)
-
-diff -Nur sundials-2.7.0.orig/src/ida/CMakeLists.txt sundials-2.7.0/src/ida/CMakeLists.txt
---- sundials-2.7.0.orig/src/ida/CMakeLists.txt 2016-09-26 22:17:26.000000000 +0000
-+++ sundials-2.7.0/src/ida/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
-@@ -124,7 +124,7 @@
- PROPERTIES OUTPUT_NAME sundials_ida CLEAN_DIRECT_OUTPUT 1)
-
- # Install the IDA library
-- INSTALL(TARGETS sundials_ida_static DESTINATION lib)
-+ INSTALL(TARGETS sundials_ida_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- ENDIF(BUILD_STATIC_LIBS)
-
-@@ -143,8 +143,10 @@
- SET_TARGET_PROPERTIES(sundials_ida_shared
- PROPERTIES VERSION ${idalib_VERSION} SOVERSION ${idalib_SOVERSION})
-
-+ TARGET_LINK_LIBRARIES(sundials_ida_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+
- # Install the IDA library
-- INSTALL(TARGETS sundials_ida_shared DESTINATION lib)
-+ INSTALL(TARGETS sundials_ida_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- ENDIF(BUILD_SHARED_LIBS)
-
-diff -Nur sundials-2.7.0.orig/src/ida/fcmix/CMakeLists.txt sundials-2.7.0/src/ida/fcmix/CMakeLists.txt
---- sundials-2.7.0.orig/src/ida/fcmix/CMakeLists.txt 2016-09-26 22:17:26.000000000 +0000
-+++ sundials-2.7.0/src/ida/fcmix/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
-@@ -56,6 +56,6 @@
- PROPERTIES OUTPUT_NAME sundials_fida CLEAN_DIRECT_OUTPUT 1)
-
- # Install the FIDA library
--INSTALL(TARGETS sundials_fida_static DESTINATION lib)
-+INSTALL(TARGETS sundials_fida_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- #
- MESSAGE(STATUS "Added IDA FCMIX module")
-diff -Nur sundials-2.7.0.orig/src/idas/CMakeLists.txt sundials-2.7.0/src/idas/CMakeLists.txt
---- sundials-2.7.0.orig/src/idas/CMakeLists.txt 2016-09-26 22:17:32.000000000 +0000
-+++ sundials-2.7.0/src/idas/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
-@@ -126,7 +126,7 @@
- PROPERTIES OUTPUT_NAME sundials_idas CLEAN_DIRECT_OUTPUT 1)
-
- # Install the IDA library
-- INSTALL(TARGETS sundials_idas_static DESTINATION lib)
-+ INSTALL(TARGETS sundials_idas_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- ENDIF(BUILD_STATIC_LIBS)
-
-@@ -145,8 +145,10 @@
- SET_TARGET_PROPERTIES(sundials_idas_shared
- PROPERTIES VERSION ${idaslib_VERSION} SOVERSION ${idaslib_SOVERSION})
-
-+ TARGET_LINK_LIBRARIES(sundials_idas_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+
- # Install the IDAS library
-- INSTALL(TARGETS sundials_idas_shared DESTINATION lib)
-+ INSTALL(TARGETS sundials_idas_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- ENDIF(BUILD_SHARED_LIBS)
-
-diff -Nur sundials-2.7.0.orig/src/kinsol/CMakeLists.txt sundials-2.7.0/src/kinsol/CMakeLists.txt
---- sundials-2.7.0.orig/src/kinsol/CMakeLists.txt 2016-09-26 22:17:39.000000000 +0000
-+++ sundials-2.7.0/src/kinsol/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
-@@ -134,7 +134,7 @@
- PROPERTIES OUTPUT_NAME sundials_kinsol CLEAN_DIRECT_OUTPUT 1)
-
- # Install the KINSOL library
-- INSTALL(TARGETS sundials_kinsol_static DESTINATION lib)
-+ INSTALL(TARGETS sundials_kinsol_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- ENDIF(BUILD_STATIC_LIBS)
-
-@@ -153,8 +153,10 @@
- SET_TARGET_PROPERTIES(sundials_kinsol_shared
- PROPERTIES VERSION ${kinsollib_VERSION} SOVERSION ${kinsollib_SOVERSION})
-
-+ TARGET_LINK_LIBRARIES(sundials_kinsol_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+
- # Install the KINSOL library
-- INSTALL(TARGETS sundials_kinsol_shared DESTINATION lib)
-+ INSTALL(TARGETS sundials_kinsol_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- ENDIF(BUILD_SHARED_LIBS)
-
-diff -Nur sundials-2.7.0.orig/src/kinsol/fcmix/CMakeLists.txt sundials-2.7.0/src/kinsol/fcmix/CMakeLists.txt
---- sundials-2.7.0.orig/src/kinsol/fcmix/CMakeLists.txt 2016-09-26 22:17:39.000000000 +0000
-+++ sundials-2.7.0/src/kinsol/fcmix/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
-@@ -54,7 +54,7 @@
- PROPERTIES OUTPUT_NAME sundials_fkinsol CLEAN_DIRECT_OUTPUT 1)
-
- # Install the FKINSOL library
--INSTALL(TARGETS sundials_fkinsol_static DESTINATION lib)
-+INSTALL(TARGETS sundials_fkinsol_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- #
- MESSAGE(STATUS "Added KINSOL FCMIX module")
-diff -Nur sundials-2.7.0.orig/src/nvec_openmp/CMakeLists.txt sundials-2.7.0/src/nvec_openmp/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_openmp/CMakeLists.txt 2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_openmp/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
-@@ -51,7 +51,7 @@
- ADD_LIBRARY(sundials_nvecopenmp_static STATIC ${nvecopenmp_SOURCES} ${shared_SOURCES})
- SET_TARGET_PROPERTIES(sundials_nvecopenmp_static
- PROPERTIES OUTPUT_NAME sundials_nvecopenmp CLEAN_DIRECT_OUTPUT 1)
-- INSTALL(TARGETS sundials_nvecopenmp_static DESTINATION lib)
-+ INSTALL(TARGETS sundials_nvecopenmp_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
-
- # Rules for building and installing the shared library:
-@@ -65,7 +65,8 @@
- PROPERTIES OUTPUT_NAME sundials_nvecopenmp CLEAN_DIRECT_OUTPUT 1)
- SET_TARGET_PROPERTIES(sundials_nvecopenmp_shared
- PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
-- INSTALL(TARGETS sundials_nvecopenmp_shared DESTINATION lib)
-+ TARGET_LINK_LIBRARIES(sundials_nvecopenmp_shared -lm)
-+ INSTALL(TARGETS sundials_nvecopenmp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
-
- # Install the NVECOPENMP header files
-@@ -78,7 +79,7 @@
- ADD_LIBRARY(sundials_fnvecopenmp_static STATIC ${fnvecopenmp_SOURCES})
- SET_TARGET_PROPERTIES(sundials_fnvecopenmp_static
- PROPERTIES OUTPUT_NAME sundials_fnvecopenmp CLEAN_DIRECT_OUTPUT 1)
-- INSTALL(TARGETS sundials_fnvecopenmp_static DESTINATION lib)
-+ INSTALL(TARGETS sundials_fnvecopenmp_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_fnvecopenmp_shared ${fnvecopenmp_SOURCES})
-@@ -86,7 +87,8 @@
- PROPERTIES OUTPUT_NAME sundials_fnvecopenmp CLEAN_DIRECT_OUTPUT 1)
- SET_TARGET_PROPERTIES(sundials_fnvecopenmp_shared
- PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
-- INSTALL(TARGETS sundials_fnvecopenmp_shared DESTINATION lib)
-+ TARGET_LINK_LIBRARIES(sundials_fnvecopenmp_shared -lm)
-+ INSTALL(TARGETS sundials_fnvecopenmp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- ENDIF(FCMIX_ENABLE AND F77_FOUND)
-
-diff -Nur sundials-2.7.0.orig/src/nvec_par/CMakeLists.txt sundials-2.7.0/src/nvec_par/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_par/CMakeLists.txt 2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_par/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
-@@ -52,7 +52,7 @@
- ADD_LIBRARY(sundials_nvecparallel_static STATIC ${nvecparallel_SOURCES} ${shared_SOURCES})
- SET_TARGET_PROPERTIES(sundials_nvecparallel_static
- PROPERTIES OUTPUT_NAME sundials_nvecparallel CLEAN_DIRECT_OUTPUT 1)
-- INSTALL(TARGETS sundials_nvecparallel_static DESTINATION lib)
-+ INSTALL(TARGETS sundials_nvecparallel_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
-
- # Rules for building and installing the shared library:
-@@ -66,7 +66,8 @@
- PROPERTIES OUTPUT_NAME sundials_nvecparallel CLEAN_DIRECT_OUTPUT 1)
- SET_TARGET_PROPERTIES(sundials_nvecparallel_shared
- PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
-- INSTALL(TARGETS sundials_nvecparallel_shared DESTINATION lib)
-+ TARGET_LINK_LIBRARIES(sundials_nvecparallel_shared -lm)
-+ INSTALL(TARGETS sundials_nvecparallel_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
-
- # Install the NVECPARALLEL header files
-@@ -79,7 +80,7 @@
- ADD_LIBRARY(sundials_fnvecparallel_static STATIC ${fnvecparallel_SOURCES})
- SET_TARGET_PROPERTIES(sundials_fnvecparallel_static
- PROPERTIES OUTPUT_NAME sundials_fnvecparallel CLEAN_DIRECT_OUTPUT 1)
-- INSTALL(TARGETS sundials_fnvecparallel_static DESTINATION lib)
-+ INSTALL(TARGETS sundials_fnvecparallel_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_fnvecparallel_shared SHARED ${fnvecparallel_SOURCES})
-@@ -87,7 +88,7 @@
- PROPERTIES OUTPUT_NAME sundials_fnvecparallel CLEAN_DIRECT_OUTPUT 1)
- SET_TARGET_PROPERTIES(sundials_fnvecparallel_shared
- PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
-- INSTALL(TARGETS sundials_fnvecparallel_shared DESTINATION lib)
-+ INSTALL(TARGETS sundials_fnvecparallel_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- ENDIF(FCMIX_ENABLE AND MPIF_FOUND)
- #
-diff -Nur sundials-2.7.0.orig/src/nvec_parhyp/CMakeLists.txt sundials-2.7.0/src/nvec_parhyp/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_parhyp/CMakeLists.txt 2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_parhyp/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
-@@ -53,7 +53,7 @@
- ADD_LIBRARY(sundials_nvecparhyp_static STATIC ${nvecparhyp_SOURCES} ${shared_SOURCES})
- SET_TARGET_PROPERTIES(sundials_nvecparhyp_static
- PROPERTIES OUTPUT_NAME sundials_nvecparhyp CLEAN_DIRECT_OUTPUT 1)
-- INSTALL(TARGETS sundials_nvecparhyp_static DESTINATION lib)
-+ INSTALL(TARGETS sundials_nvecparhyp_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
-
- # Rules for building and installing the shared library:
-@@ -67,7 +67,7 @@
- PROPERTIES OUTPUT_NAME sundials_nvecparhyp CLEAN_DIRECT_OUTPUT 1)
- SET_TARGET_PROPERTIES(sundials_nvecparhyp_shared
- PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
-- INSTALL(TARGETS sundials_nvecparhyp_shared DESTINATION lib)
-+ INSTALL(TARGETS sundials_nvecparhyp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
-
- # Install the NVECPARHYP header files
-diff -Nur sundials-2.7.0.orig/src/nvec_petsc/CMakeLists.txt sundials-2.7.0/src/nvec_petsc/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_petsc/CMakeLists.txt 2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_petsc/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
-@@ -53,7 +53,7 @@
- ADD_LIBRARY(sundials_nvecpetsc_static STATIC ${nvecpetsc_SOURCES} ${shared_SOURCES})
- SET_TARGET_PROPERTIES(sundials_nvecpetsc_static
- PROPERTIES OUTPUT_NAME sundials_nvecpetsc CLEAN_DIRECT_OUTPUT 1)
-- INSTALL(TARGETS sundials_nvecpetsc_static DESTINATION lib)
-+ INSTALL(TARGETS sundials_nvecpetsc_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
-
- # Rules for building and installing the shared library:
-@@ -67,7 +67,7 @@
- PROPERTIES OUTPUT_NAME sundials_nvecpetsc CLEAN_DIRECT_OUTPUT 1)
- SET_TARGET_PROPERTIES(sundials_nvecpetsc_shared
- PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
-- INSTALL(TARGETS sundials_nvecpetsc_shared DESTINATION lib)
-+ INSTALL(TARGETS sundials_nvecpetsc_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
-
- # Install the NVECPARHYP header files
-diff -Nur sundials-2.7.0.orig/src/nvec_pthreads/CMakeLists.txt sundials-2.7.0/src/nvec_pthreads/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_pthreads/CMakeLists.txt 2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_pthreads/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
-@@ -44,7 +44,7 @@
- ADD_LIBRARY(sundials_nvecpthreads_static STATIC ${nvecpthreads_SOURCES} ${shared_SOURCES})
- SET_TARGET_PROPERTIES(sundials_nvecpthreads_static
- PROPERTIES OUTPUT_NAME sundials_nvecpthreads CLEAN_DIRECT_OUTPUT 1)
-- INSTALL(TARGETS sundials_nvecpthreads_static DESTINATION lib)
-+ INSTALL(TARGETS sundials_nvecpthreads_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
-
- # Rules for building and installing the shared library:
-@@ -58,7 +58,8 @@
- PROPERTIES OUTPUT_NAME sundials_nvecpthreads CLEAN_DIRECT_OUTPUT 1)
- SET_TARGET_PROPERTIES(sundials_nvecpthreads_shared
- PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
-- INSTALL(TARGETS sundials_nvecpthreads_shared DESTINATION lib)
-+ TARGET_LINK_LIBRARIES(sundials_nvecpthreads_shared -lm -lpthread)
-+ INSTALL(TARGETS sundials_nvecpthreads_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
-
- # Install the NVECPTHREADS header files
-@@ -71,7 +72,7 @@
- ADD_LIBRARY(sundials_fnvecpthreads_static STATIC ${fnvecpthreads_SOURCES})
- SET_TARGET_PROPERTIES(sundials_fnvecpthreads_static
- PROPERTIES OUTPUT_NAME sundials_fnvecpthreads CLEAN_DIRECT_OUTPUT 1)
-- INSTALL(TARGETS sundials_fnvecpthreads_static DESTINATION lib)
-+ INSTALL(TARGETS sundials_fnvecpthreads_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_fnvecpthreads_shared ${fnvecpthreads_SOURCES})
-@@ -79,7 +80,8 @@
- PROPERTIES OUTPUT_NAME sundials_fnvecpthreads CLEAN_DIRECT_OUTPUT 1)
- SET_TARGET_PROPERTIES(sundials_fnvecpthreads_shared
- PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
-- INSTALL(TARGETS sundials_fnvecpthreads_shared DESTINATION lib)
-+ TARGET_LINK_LIBRARIES(sundials_fnvecpthreads_shared -lm -lpthread)
-+ INSTALL(TARGETS sundials_fnvecpthreads_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- ENDIF(FCMIX_ENABLE AND F77_FOUND)
-
-diff -Nur sundials-2.7.0.orig/src/nvec_ser/CMakeLists.txt sundials-2.7.0/src/nvec_ser/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_ser/CMakeLists.txt 2016-09-26 22:16:49.000000000 +0000
-+++ sundials-2.7.0/src/nvec_ser/CMakeLists.txt 2016-12-30 23:41:54.355840949 +0000
-@@ -44,7 +44,7 @@
- ADD_LIBRARY(sundials_nvecserial_static STATIC ${nvecserial_SOURCES} ${shared_SOURCES})
- SET_TARGET_PROPERTIES(sundials_nvecserial_static
- PROPERTIES OUTPUT_NAME sundials_nvecserial CLEAN_DIRECT_OUTPUT 1)
-- INSTALL(TARGETS sundials_nvecserial_static DESTINATION lib)
-+ INSTALL(TARGETS sundials_nvecserial_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
-
- # Rules for building and installing the shared library:
-@@ -58,7 +58,8 @@
- PROPERTIES OUTPUT_NAME sundials_nvecserial CLEAN_DIRECT_OUTPUT 1)
- SET_TARGET_PROPERTIES(sundials_nvecserial_shared
- PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
-- INSTALL(TARGETS sundials_nvecserial_shared DESTINATION lib)
-+ TARGET_LINK_LIBRARIES(sundials_nvecserial_shared -lm)
-+ INSTALL(TARGETS sundials_nvecserial_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
-
- # Install the NVECSERIAL header files
-@@ -71,7 +72,7 @@
- ADD_LIBRARY(sundials_fnvecserial_static STATIC ${fnvecserial_SOURCES})
- SET_TARGET_PROPERTIES(sundials_fnvecserial_static
- PROPERTIES OUTPUT_NAME sundials_fnvecserial CLEAN_DIRECT_OUTPUT 1)
-- INSTALL(TARGETS sundials_fnvecserial_static DESTINATION lib)
-+ INSTALL(TARGETS sundials_fnvecserial_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_fnvecserial_shared ${fnvecserial_SOURCES})
-@@ -79,7 +80,8 @@
- PROPERTIES OUTPUT_NAME sundials_fnvecserial CLEAN_DIRECT_OUTPUT 1)
- SET_TARGET_PROPERTIES(sundials_fnvecserial_shared
- PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
-- INSTALL(TARGETS sundials_fnvecserial_shared DESTINATION lib)
-+ TARGET_LINK_LIBRARIES(sundials_fnvecserial_shared -lm)
-+ INSTALL(TARGETS sundials_fnvecserial_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- ENDIF(FCMIX_ENABLE AND F77_FOUND)
-
diff --git a/sci-libs/sundials/files/sundials-3.1.2-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-3.1.2-fix-license-install-path.patch
deleted file mode 100644
index 188e29999fc..00000000000
--- a/sci-libs/sundials/files/sundials-3.1.2-fix-license-install-path.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ru sundials-3.1.2.orig/CMakeLists.txt sundials-3.1.2/CMakeLists.txt
---- sundials-3.1.2.orig/CMakeLists.txt 2018-07-31 17:25:19.000000000 -0000
-+++ sundials-3.1.2/CMakeLists.txt 2019-04-17 12:18:58.894563957 -0000
-@@ -1629,4 +1629,4 @@
- # install license file
- INSTALL(
- FILES ${PROJECT_SOURCE_DIR}/LICENSE
-- DESTINATION include/sundials)
-+ DESTINATION share/doc/sundials-3.1.2)
diff --git a/sci-libs/sundials/sundials-2.7.0.ebuild b/sci-libs/sundials/sundials-2.7.0.ebuild
deleted file mode 100644
index 3b5df344e82..00000000000
--- a/sci-libs/sundials/sundials-2.7.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2 versionator
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(get_major_version)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-RDEPEND="
- lapack? ( virtual/lapack )
- mpi? ( virtual/mpi sci-libs/hypre:= )
- sparse? ( sci-libs/klu:= )
- superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-underlinking-libdir.patch )
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
- ewarn "OpenMP is not available in your current selected gcc"
- die "need openmp capable gcc"
- fi
-}
-
-src_configure() {
- mycmakeargs+=(
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_STATIC_LIBS="$(usex static-libs)"
- -DCXX_ENABLE="$(usex cxx)"
- -DFCMIX_ENABLE="$(usex fortran)"
- -DF90_ENABLE="$(usex fortran)"
- -DHYPRE_ENABLE="$(usex hypre)"
- -DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
- -DHYPRE_LIBRARY="HYPRE"
- -DKLU_ENABLE="$(usex sparse)"
- -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
- -DLAPACK_ENABLE="$(usex lapack)"
- -DMPI_ENABLE="$(usex mpi)"
- -DOPENMP_ENABLE="$(usex openmp)"
- -DPTHREAD_ENABLE="$(usex threads)"
- -DSUPERLUMT_ENABLE="$(usex superlumt)"
- -DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
- -DSUPERLUMT_LIBRARY="superlu_mt"
- -DEXAMPLES_ENABLE="$(usex examples)"
- -DEXAMPLES_INSTALL=ON
- -DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
- -DUSE_GENERIC_MATH=ON
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- use doc && dodoc doc/*/*.pdf
- cd src
- for r in */README; do
- newdoc ${r} README-${r%/*}
- done
-}
diff --git a/sci-libs/sundials/sundials-3.0.0.ebuild b/sci-libs/sundials/sundials-3.0.0.ebuild
deleted file mode 100644
index 5be73141477..00000000000
--- a/sci-libs/sundials/sundials-3.0.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2 versionator
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(get_major_version)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-RDEPEND="
- lapack? ( virtual/lapack )
- mpi? ( virtual/mpi sci-libs/hypre:= )
- sparse? ( sci-libs/klu:= )
- superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=( )
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
- ewarn "OpenMP is not available in your current selected gcc"
- die "need openmp capable gcc"
- fi
-}
-
-src_configure() {
- mycmakeargs+=(
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_STATIC_LIBS="$(usex static-libs)"
- -DCXX_ENABLE="$(usex cxx)"
- -DFCMIX_ENABLE="$(usex fortran)"
- -DF90_ENABLE="$(usex fortran)"
- -DHYPRE_ENABLE="$(usex hypre)"
- -DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
- -DHYPRE_LIBRARY="HYPRE"
- -DKLU_ENABLE="$(usex sparse)"
- -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
- -DLAPACK_ENABLE="$(usex lapack)"
- -DMPI_ENABLE="$(usex mpi)"
- -DOPENMP_ENABLE="$(usex openmp)"
- -DPTHREAD_ENABLE="$(usex threads)"
- -DSUPERLUMT_ENABLE="$(usex superlumt)"
- -DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
- -DSUPERLUMT_LIBRARY="superlu_mt"
- -DEXAMPLES_ENABLE="$(usex examples)"
- -DEXAMPLES_INSTALL=ON
- -DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
- -DUSE_GENERIC_MATH=ON
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- use doc && dodoc doc/*/*.pdf
- cd src
- for r in */README; do
- newdoc ${r} README-${r%/*}
- done
-
- # Use a sledgehammer, patching the buildsystem is too annoyoing (the
- # CMake build systems consists of 2000 "lib" DESTINATIONS...)
- if [[ lib != $(get_libdir) ]]; then
- mv "${ED%/}"/usr/lib "${ED%/}"/usr/$(get_libdir) || die
- fi
-}
diff --git a/sci-libs/sundials/sundials-3.1.0.ebuild b/sci-libs/sundials/sundials-3.1.0.ebuild
deleted file mode 100644
index 6285504725e..00000000000
--- a/sci-libs/sundials/sundials-3.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2 versionator
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(get_major_version)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-RDEPEND="
- lapack? ( virtual/lapack )
- mpi? ( virtual/mpi sci-libs/hypre:= )
- sparse? ( sci-libs/klu:= )
- superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=( )
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
- ewarn "OpenMP is not available in your current selected gcc"
- die "need openmp capable gcc"
- fi
-}
-
-src_configure() {
- mycmakeargs+=(
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_STATIC_LIBS="$(usex static-libs)"
- -DCXX_ENABLE="$(usex cxx)"
- -DFCMIX_ENABLE="$(usex fortran)"
- -DF90_ENABLE="$(usex fortran)"
- -DHYPRE_ENABLE="$(usex hypre)"
- -DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
- -DKLU_ENABLE="$(usex sparse)"
- -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
- -DLAPACK_ENABLE="$(usex lapack)"
- -DMPI_ENABLE="$(usex mpi)"
- -DOPENMP_ENABLE="$(usex openmp)"
- -DPTHREAD_ENABLE="$(usex threads)"
- -DSUPERLUMT_ENABLE="$(usex superlumt)"
- -DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
- -DSUPERLUMT_LIBRARY="superlu_mt"
- -DEXAMPLES_ENABLE="$(usex examples)"
- -DEXAMPLES_INSTALL=ON
- -DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
- -DUSE_GENERIC_MATH=ON
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- use doc && dodoc doc/*/*.pdf
- cd src
- for r in */README; do
- newdoc ${r} README-${r%/*}
- done
-
- # Use a sledgehammer, patching the buildsystem is too annoyoing (the
- # CMake build systems consists of 2000 "lib" DESTINATIONS...)
- if [[ lib != $(get_libdir) ]]; then
- mv "${ED%/}"/usr/lib "${ED%/}"/usr/$(get_libdir) || die
- fi
-}
diff --git a/sci-libs/sundials/sundials-3.1.2.ebuild b/sci-libs/sundials/sundials-3.1.2.ebuild
deleted file mode 100644
index e5ad2325ff8..00000000000
--- a/sci-libs/sundials/sundials-3.1.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2 versionator
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(get_major_version)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-RDEPEND="
- lapack? ( virtual/lapack )
- mpi? ( virtual/mpi sci-libs/hypre:= )
- sparse? ( sci-libs/klu:= )
- superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
- ewarn "OpenMP is not available in your current selected gcc"
- die "need openmp capable gcc"
- fi
-}
-
-src_configure() {
- mycmakeargs+=(
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_STATIC_LIBS="$(usex static-libs)"
- -DCXX_ENABLE="$(usex cxx)"
- -DFCMIX_ENABLE="$(usex fortran)"
- -DF90_ENABLE="$(usex fortran)"
- -DHYPRE_ENABLE="$(usex hypre)"
- -DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
- -DKLU_ENABLE="$(usex sparse)"
- -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
- -DLAPACK_ENABLE="$(usex lapack)"
- -DMPI_ENABLE="$(usex mpi)"
- -DOPENMP_ENABLE="$(usex openmp)"
- -DPTHREAD_ENABLE="$(usex threads)"
- -DSUPERLUMT_ENABLE="$(usex superlumt)"
- -DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
- -DSUPERLUMT_LIBRARY="superlu_mt"
- -DEXAMPLES_ENABLE="$(usex examples)"
- -DEXAMPLES_INSTALL=ON
- -DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
- -DUSE_GENERIC_MATH=ON
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- use doc && dodoc doc/*/*.pdf
- cd src
- for r in */README; do
- newdoc ${r} README-${r%/*}
- done
-
- # Use a sledgehammer, patching the buildsystem is too annoyoing (the
- # CMake build systems consists of 2000 "lib" DESTINATIONS...)
- if [[ lib != $(get_libdir) ]]; then
- mv "${ED%/}"/usr/lib "${ED%/}"/usr/$(get_libdir) || die
- fi
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/sundials/files/, sci-libs/sundials/
@ 2019-12-24 14:47 Matthias Maier
0 siblings, 0 replies; 11+ messages in thread
From: Matthias Maier @ 2019-12-24 14:47 UTC (permalink / raw
To: gentoo-commits
commit: 8537444806d831ac0a5fe847d0da95c446aaea87
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 24 14:32:21 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Dec 24 14:47:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85374448
sci-libs/sundials: version bump to 5.0.0
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/sundials/Manifest | 1 +
.../sundials-5.0.0-fix-license-install-path.patch | 16 +++++
sci-libs/sundials/sundials-5.0.0.ebuild | 69 ++++++++++++++++++++++
3 files changed, 86 insertions(+)
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index e3e6893d43f..b98d5eaf31f 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -1,3 +1,4 @@
DIST sundials-3.2.1.tar.gz 14958699 BLAKE2B ecc4b454ec589e9177acc9375e1db370ad6281f8d29580d9558ad3146dbbaab52794013e9cb56ad83f7309dbd3084a1ccaf6972c6b1468cefcc86bf30d3a460c SHA512 1f3e4b12f368e4f50c38b970c012f1702e339319ee0a858661bdf83e5739bb5b8a36f98b82e2ef76d1ce8a473123046347ee1b44f3cb685509823864f0af1384
DIST sundials-4.0.2.tar.gz 17183377 BLAKE2B e322a978186f41d84a936faa55962ef6794bf99d6c6a108bfa2bd5615f27f32f7ab6ca4989802fa052d3132b53dca3069b7e4ec9941f95efb92de7bf0792dd88 SHA512 6d0a6fc49c695e70593da71892f0906585dee9c94899bb6b8c9a56c85f345809565166a62544647fdac411d22e37276b9b1bb78ba9be46eaeb28dcd3f6162ef5
DIST sundials-4.1.0.tar.gz 17221960 BLAKE2B 598c7adc9e37fcfb1f44a3235f58af489ad907d053cb67ee0d3b076076621958374eb847e48318ddf7ced85a7601c5330ac640c7abe8723aaee7d650e3298b8d SHA512 1922dca3f0b8869098670aede802e48abec39607c96304e4efd9b03d195b16920175846fce10641aeebc48c216bda73c8691139dce57ffa7731a6bc8194b81b0
+DIST sundials-5.0.0.tar.gz 18820465 BLAKE2B 77bc7bd489b52ff316f3e889aad4ec27830c42650591270443d45a0aa958d06663e93931a8933ca2d228619263219be4d7441cb473eaaedeab958ae47418a44e SHA512 4962adabcde19207b5044d1e63758d58b5d3cfeefcd0eae65ddfe5499931bf19fa98bafbd4742045cc255f6b4a45653f41df7a7739f86d6eb47c79c9312b4471
diff --git a/sci-libs/sundials/files/sundials-5.0.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.0.0-fix-license-install-path.patch
new file mode 100644
index 00000000000..5de76573630
--- /dev/null
+++ b/sci-libs/sundials/files/sundials-5.0.0-fix-license-install-path.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d5436bf..76b27c5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1122,9 +1122,9 @@ endif()
+ # install license and notice files
+ install(
+ FILES ${PROJECT_SOURCE_DIR}/LICENSE
+- DESTINATION include/sundials
++ DESTINATION share/doc/sundials-5.0.0
+ )
+ install(
+ FILES ${PROJECT_SOURCE_DIR}/NOTICE
+- DESTINATION include/sundials
++ DESTINATION share/doc/sundials-5.0.0
+ )
diff --git a/sci-libs/sundials/sundials-5.0.0.ebuild b/sci-libs/sundials/sundials-5.0.0.ebuild
new file mode 100644
index 00000000000..9505cbb40bf
--- /dev/null
+++ b/sci-libs/sundials/sundials-5.0.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=90
+
+inherit cmake-utils toolchain-funcs fortran-2
+
+DESCRIPTION="Suite of nonlinear solvers"
+HOMEPAGE="https://computation.llnl.gov/projects/sundials"
+SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
+REQUIRED_USE="hypre? ( mpi )"
+
+RDEPEND="
+ lapack? ( virtual/lapack )
+ mpi? ( virtual/mpi sci-libs/hypre:= )
+ sparse? ( sci-libs/klu:= )
+ superlumt? ( sci-libs/superlu_mt:= )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+ ewarn "OpenMP is not available in your current selected gcc"
+ die "need openmp capable gcc"
+ fi
+}
+
+src_configure() {
+ mycmakeargs+=(
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_STATIC_LIBS="$(usex static-libs)"
+ -DCXX_ENABLE="$(usex cxx)"
+ -DFCMIX_ENABLE="$(usex fortran)"
+ -DF90_ENABLE="$(usex fortran)"
+ -DHYPRE_ENABLE="$(usex hypre)"
+ -DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
+ -DKLU_ENABLE="$(usex sparse)"
+ -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
+ -DLAPACK_ENABLE="$(usex lapack)"
+ -DMPI_ENABLE="$(usex mpi)"
+ -DOPENMP_ENABLE="$(usex openmp)"
+ -DPTHREAD_ENABLE="$(usex threads)"
+ -DSUPERLUMT_ENABLE="$(usex superlumt)"
+ -DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
+ -DSUPERLUMT_LIBRARY="-lsuperlu_mt"
+ -DEXAMPLES_ENABLE="$(usex examples)"
+ -DEXAMPLES_INSTALL=ON
+ -DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+ -DUSE_GENERIC_MATH=ON
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ use doc && dodoc doc/*/*.pdf
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/sundials/files/, sci-libs/sundials/
@ 2020-03-05 12:21 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2020-03-05 12:21 UTC (permalink / raw
To: gentoo-commits
commit: 7817c436150b75be5fb955ac60ed110e6248e9a1
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Fri Feb 28 22:42:30 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Mar 5 11:54:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7817c436
sci-libs/sundials: 5.1.0 version bump
The following changes within ebuild were made:
- FORTRAN_STANDARD=90 changed to FORTRAN_STANDARD="77 90"
(with comment that "FFLAGS and FCFLAGS if set should e equal",
otherwhise the cmake configurations error takes place);
- sorted inherit items;
- cmake-utils eclass replaced by cmake eclass;
- assignment of KLU_LIBRARY cmake variable moved to use condition expression.
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/sundials/Manifest | 1 +
.../sundials-5.1.0-fix-license-install-path.patch | 16 +++++
sci-libs/sundials/sundials-5.1.0.ebuild | 70 ++++++++++++++++++++++
3 files changed, 87 insertions(+)
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index b98d5eaf31f..7e84ebcb147 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -2,3 +2,4 @@ DIST sundials-3.2.1.tar.gz 14958699 BLAKE2B ecc4b454ec589e9177acc9375e1db370ad62
DIST sundials-4.0.2.tar.gz 17183377 BLAKE2B e322a978186f41d84a936faa55962ef6794bf99d6c6a108bfa2bd5615f27f32f7ab6ca4989802fa052d3132b53dca3069b7e4ec9941f95efb92de7bf0792dd88 SHA512 6d0a6fc49c695e70593da71892f0906585dee9c94899bb6b8c9a56c85f345809565166a62544647fdac411d22e37276b9b1bb78ba9be46eaeb28dcd3f6162ef5
DIST sundials-4.1.0.tar.gz 17221960 BLAKE2B 598c7adc9e37fcfb1f44a3235f58af489ad907d053cb67ee0d3b076076621958374eb847e48318ddf7ced85a7601c5330ac640c7abe8723aaee7d650e3298b8d SHA512 1922dca3f0b8869098670aede802e48abec39607c96304e4efd9b03d195b16920175846fce10641aeebc48c216bda73c8691139dce57ffa7731a6bc8194b81b0
DIST sundials-5.0.0.tar.gz 18820465 BLAKE2B 77bc7bd489b52ff316f3e889aad4ec27830c42650591270443d45a0aa958d06663e93931a8933ca2d228619263219be4d7441cb473eaaedeab958ae47418a44e SHA512 4962adabcde19207b5044d1e63758d58b5d3cfeefcd0eae65ddfe5499931bf19fa98bafbd4742045cc255f6b4a45653f41df7a7739f86d6eb47c79c9312b4471
+DIST sundials-5.1.0.tar.gz 18496945 BLAKE2B bfe2c88bd1a43c6e0b50e30a4498d23da9e495b4a27e67ff309a032f892cfd8ce54010f567f26b1ecd40a2e21e9364f0b75d0b5dde2771c9e35ad4912e7abf64 SHA512 ad2fef1197fe5680651b63a1da8fab0087416c943f9142e6d0ac8388113fb7e33a7297847f550585d7e8fed1d33111ab85235b3a2f94ac81004f5f3eb584c021
diff --git a/sci-libs/sundials/files/sundials-5.1.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.1.0-fix-license-install-path.patch
new file mode 100644
index 00000000000..48b019611cb
--- /dev/null
+++ b/sci-libs/sundials/files/sundials-5.1.0-fix-license-install-path.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d5436bf..76b27c5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1146,9 +1146,9 @@ endif()
+ # install license and notice files
+ install(
+ FILES ${PROJECT_SOURCE_DIR}/LICENSE
+- DESTINATION include/sundials
++ DESTINATION share/doc/sundials-5.1.0
+ )
+ install(
+ FILES ${PROJECT_SOURCE_DIR}/NOTICE
+- DESTINATION include/sundials
++ DESTINATION share/doc/sundials-5.1.0
+ )
diff --git a/sci-libs/sundials/sundials-5.1.0.ebuild b/sci-libs/sundials/sundials-5.1.0.ebuild
new file mode 100644
index 00000000000..c6bc6848c81
--- /dev/null
+++ b/sci-libs/sundials/sundials-5.1.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD="77 90"
+# if FFLAGS and FCFLAGS are set then should be equal
+
+inherit cmake fortran-2 toolchain-funcs
+
+DESCRIPTION="Suite of nonlinear solvers"
+HOMEPAGE="https://computation.llnl.gov/projects/sundials"
+SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
+REQUIRED_USE="hypre? ( mpi )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ lapack? ( virtual/lapack )
+ mpi? ( virtual/mpi sci-libs/hypre:= )
+ sparse? ( sci-libs/klu )
+ superlumt? ( sci-libs/superlu_mt:= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+ ewarn "OpenMP is not available in your current selected gcc"
+ die "need openmp capable gcc"
+ fi
+}
+
+src_configure() {
+ mycmakeargs+=(
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_STATIC_LIBS="$(usex static-libs)"
+ -DCXX_ENABLE="$(usex cxx)"
+ -DFCMIX_ENABLE="$(usex fortran)"
+ -DF90_ENABLE="$(usex fortran)"
+ -DHYPRE_ENABLE="$(usex hypre)"
+ -DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
+ -DKLU_ENABLE="$(usex sparse)"
+ -DLAPACK_ENABLE="$(usex lapack)"
+ -DMPI_ENABLE="$(usex mpi)"
+ -DOPENMP_ENABLE="$(usex openmp)"
+ -DPTHREAD_ENABLE="$(usex threads)"
+ -DSUPERLUMT_ENABLE="$(usex superlumt)"
+ -DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
+ -DSUPERLUMT_LIBRARY="-lsuperlu_mt"
+ -DEXAMPLES_ENABLE="$(usex examples)"
+ -DEXAMPLES_INSTALL=ON
+ -DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+ -DUSE_GENERIC_MATH=ON
+ )
+ use sparse && mycmakeargs+=( -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so" )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ use doc && dodoc doc/*/*.pdf
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/sundials/files/, sci-libs/sundials/
@ 2020-05-05 16:54 Matthias Maier
0 siblings, 0 replies; 11+ messages in thread
From: Matthias Maier @ 2020-05-05 16:54 UTC (permalink / raw
To: gentoo-commits
commit: 43d6a87a2087599304ddeb2996abb999102c8e74
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Tue Apr 21 12:12:34 2020 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue May 5 16:50:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43d6a87a
sci-libs/sundials: 5.2.0 version bump
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/sundials/Manifest | 1 +
.../sundials-5.2.0-fix-license-install-path.patch | 15 +++++
sci-libs/sundials/sundials-5.2.0.ebuild | 70 ++++++++++++++++++++++
3 files changed, 86 insertions(+)
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index 7e84ebcb147..0ad406c16c2 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -3,3 +3,4 @@ DIST sundials-4.0.2.tar.gz 17183377 BLAKE2B e322a978186f41d84a936faa55962ef6794b
DIST sundials-4.1.0.tar.gz 17221960 BLAKE2B 598c7adc9e37fcfb1f44a3235f58af489ad907d053cb67ee0d3b076076621958374eb847e48318ddf7ced85a7601c5330ac640c7abe8723aaee7d650e3298b8d SHA512 1922dca3f0b8869098670aede802e48abec39607c96304e4efd9b03d195b16920175846fce10641aeebc48c216bda73c8691139dce57ffa7731a6bc8194b81b0
DIST sundials-5.0.0.tar.gz 18820465 BLAKE2B 77bc7bd489b52ff316f3e889aad4ec27830c42650591270443d45a0aa958d06663e93931a8933ca2d228619263219be4d7441cb473eaaedeab958ae47418a44e SHA512 4962adabcde19207b5044d1e63758d58b5d3cfeefcd0eae65ddfe5499931bf19fa98bafbd4742045cc255f6b4a45653f41df7a7739f86d6eb47c79c9312b4471
DIST sundials-5.1.0.tar.gz 18496945 BLAKE2B bfe2c88bd1a43c6e0b50e30a4498d23da9e495b4a27e67ff309a032f892cfd8ce54010f567f26b1ecd40a2e21e9364f0b75d0b5dde2771c9e35ad4912e7abf64 SHA512 ad2fef1197fe5680651b63a1da8fab0087416c943f9142e6d0ac8388113fb7e33a7297847f550585d7e8fed1d33111ab85235b3a2f94ac81004f5f3eb584c021
+DIST sundials-5.2.0.tar.gz 18639221 BLAKE2B c10e6deb5839993b8601347be94412d0b0c058084b4dc0d380681f7b4debd535f9736c2ef734e9fd84c6ddc190ab05f46abcb711225ec1f156a18d8edb6317fb SHA512 99163a104e436dab4779c77519502b5614b65d726324b29b14236315f6916beb5863fcd56b5acf19f62985c033b227fba1ebd3d3c4607ce991d94ee7739bb55f
diff --git a/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch
new file mode 100644
index 00000000000..8fb6c977ca7
--- /dev/null
+++ b/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch
@@ -0,0 +1,15 @@
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2020-04-01 00:03:37.000000000 +0300
++++ b/CMakeLists.txt 2020-04-21 13:27:58.000000000 +0300
+@@ -1146,9 +1146,9 @@
+ # install license and notice files
+ install(
+ FILES ${PROJECT_SOURCE_DIR}/LICENSE
+- DESTINATION include/sundials
++ DESTINATION share/doc/sundials-5.2.0
+ )
+ install(
+ FILES ${PROJECT_SOURCE_DIR}/NOTICE
+- DESTINATION include/sundials
++ DESTINATION share/doc/sundials-5.2.0
+ )
diff --git a/sci-libs/sundials/sundials-5.2.0.ebuild b/sci-libs/sundials/sundials-5.2.0.ebuild
new file mode 100644
index 00000000000..c6bc6848c81
--- /dev/null
+++ b/sci-libs/sundials/sundials-5.2.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD="77 90"
+# if FFLAGS and FCFLAGS are set then should be equal
+
+inherit cmake fortran-2 toolchain-funcs
+
+DESCRIPTION="Suite of nonlinear solvers"
+HOMEPAGE="https://computation.llnl.gov/projects/sundials"
+SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
+REQUIRED_USE="hypre? ( mpi )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ lapack? ( virtual/lapack )
+ mpi? ( virtual/mpi sci-libs/hypre:= )
+ sparse? ( sci-libs/klu )
+ superlumt? ( sci-libs/superlu_mt:= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+ ewarn "OpenMP is not available in your current selected gcc"
+ die "need openmp capable gcc"
+ fi
+}
+
+src_configure() {
+ mycmakeargs+=(
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_STATIC_LIBS="$(usex static-libs)"
+ -DCXX_ENABLE="$(usex cxx)"
+ -DFCMIX_ENABLE="$(usex fortran)"
+ -DF90_ENABLE="$(usex fortran)"
+ -DHYPRE_ENABLE="$(usex hypre)"
+ -DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
+ -DKLU_ENABLE="$(usex sparse)"
+ -DLAPACK_ENABLE="$(usex lapack)"
+ -DMPI_ENABLE="$(usex mpi)"
+ -DOPENMP_ENABLE="$(usex openmp)"
+ -DPTHREAD_ENABLE="$(usex threads)"
+ -DSUPERLUMT_ENABLE="$(usex superlumt)"
+ -DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
+ -DSUPERLUMT_LIBRARY="-lsuperlu_mt"
+ -DEXAMPLES_ENABLE="$(usex examples)"
+ -DEXAMPLES_INSTALL=ON
+ -DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+ -DUSE_GENERIC_MATH=ON
+ )
+ use sparse && mycmakeargs+=( -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so" )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ use doc && dodoc doc/*/*.pdf
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/sundials/files/, sci-libs/sundials/
@ 2021-01-31 20:37 David Seifert
0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2021-01-31 20:37 UTC (permalink / raw
To: gentoo-commits
commit: e8ba3ec29c32370eb12d24dcfc30c4fe7311a2e3
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 20:36:57 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 20:36:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8ba3ec2
Reverts: 35d4a5366fcceebb570ca654b80598e706f4f056
We still depend on older versions of sci-libs/sundials in
* sci-libs/dealii
* sci-mathematics/nestedsums
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-libs/sundials/Manifest | 1 +
.../sundials-3.2.1-fix-license-install-path.patch | 9 +++
sci-libs/sundials/sundials-3.2.1.ebuild | 77 ++++++++++++++++++++++
3 files changed, 87 insertions(+)
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index 76d2de2d267..8e2bf49a661 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -1 +1,2 @@
+DIST sundials-3.2.1.tar.gz 14958699 BLAKE2B ecc4b454ec589e9177acc9375e1db370ad6281f8d29580d9558ad3146dbbaab52794013e9cb56ad83f7309dbd3084a1ccaf6972c6b1468cefcc86bf30d3a460c SHA512 1f3e4b12f368e4f50c38b970c012f1702e339319ee0a858661bdf83e5739bb5b8a36f98b82e2ef76d1ce8a473123046347ee1b44f3cb685509823864f0af1384
DIST sundials-5.2.0.tar.gz 18639221 BLAKE2B c10e6deb5839993b8601347be94412d0b0c058084b4dc0d380681f7b4debd535f9736c2ef734e9fd84c6ddc190ab05f46abcb711225ec1f156a18d8edb6317fb SHA512 99163a104e436dab4779c77519502b5614b65d726324b29b14236315f6916beb5863fcd56b5acf19f62985c033b227fba1ebd3d3c4607ce991d94ee7739bb55f
diff --git a/sci-libs/sundials/files/sundials-3.2.1-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-3.2.1-fix-license-install-path.patch
new file mode 100644
index 00000000000..eba90b52ac4
--- /dev/null
+++ b/sci-libs/sundials/files/sundials-3.2.1-fix-license-install-path.patch
@@ -0,0 +1,9 @@
+diff -Nur old/CMakeLists.txt new/CMakeLists.txt
+--- old/CMakeLists.txt 2018-10-11 22:22:09.000000000 +0300
++++ new/CMakeLists.txt 2019-06-23 00:33:27.000000000 +0300
+@@ -1117,4 +1117,4 @@
+ # install license file
+ INSTALL(
+ FILES ${PROJECT_SOURCE_DIR}/LICENSE
+- DESTINATION include/sundials)
++ DESTINATION share/doc/sundials-3.2.1)
diff --git a/sci-libs/sundials/sundials-3.2.1.ebuild b/sci-libs/sundials/sundials-3.2.1.ebuild
new file mode 100644
index 00000000000..36bca3f96aa
--- /dev/null
+++ b/sci-libs/sundials/sundials-3.2.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=90
+
+inherit cmake-utils toolchain-funcs fortran-2
+
+DESCRIPTION="Suite of nonlinear solvers"
+HOMEPAGE="https://computation.llnl.gov/projects/sundials"
+SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
+REQUIRED_USE="hypre? ( mpi )"
+
+RDEPEND="
+ lapack? ( virtual/lapack )
+ mpi? ( virtual/mpi sci-libs/hypre:= )
+ sparse? ( sci-libs/klu:= )
+ superlumt? ( sci-libs/superlu_mt:= )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+ ewarn "OpenMP is not available in your current selected gcc"
+ die "need openmp capable gcc"
+ fi
+}
+
+src_configure() {
+ mycmakeargs+=(
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_STATIC_LIBS="$(usex static-libs)"
+ -DCXX_ENABLE="$(usex cxx)"
+ -DFCMIX_ENABLE="$(usex fortran)"
+ -DF90_ENABLE="$(usex fortran)"
+ -DHYPRE_ENABLE="$(usex hypre)"
+ -DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
+ -DKLU_ENABLE="$(usex sparse)"
+ -DLAPACK_ENABLE="$(usex lapack)"
+ -DMPI_ENABLE="$(usex mpi)"
+ -DOPENMP_ENABLE="$(usex openmp)"
+ -DPTHREAD_ENABLE="$(usex threads)"
+ -DSUPERLUMT_ENABLE="$(usex superlumt)"
+ -DEXAMPLES_ENABLE="$(usex examples)"
+ -DEXAMPLES_INSTALL=ON
+ -DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+ -DUSE_GENERIC_MATH=ON
+ )
+ use sparse && mycmakeargs+=(
+ -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
+ )
+ use superlumt && mycmakeargs+=(
+ -DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
+ -DSUPERLUMT_LIBRARY="superlu_mt"
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ use doc && dodoc doc/*/*.pdf
+ cd src
+ for r in */README; do
+ newdoc ${r} README-${r%/*}
+ done
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/sundials/files/, sci-libs/sundials/
@ 2021-10-04 19:33 Jakov Smolić
0 siblings, 0 replies; 11+ messages in thread
From: Jakov Smolić @ 2021-10-04 19:33 UTC (permalink / raw
To: gentoo-commits
commit: e5c0a08d3cecd7466fbda92233bbbd498e275505
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Oct 4 18:56:43 2021 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Oct 4 19:33:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5c0a08d
sci-libs/sundials: add 5.8.0
Closes: https://bugs.gentoo.org/787341
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
sci-libs/sundials/Manifest | 1 +
.../sundials-5.8.0-fix-license-install-path.patch | 29 ++++++
sci-libs/sundials/sundials-5.8.0.ebuild | 114 +++++++++++++++++++++
3 files changed, 144 insertions(+)
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index 6bbc8edccc4..17ed196b551 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -1,2 +1,3 @@
DIST sundials-5.2.0.tar.gz 18639221 BLAKE2B c10e6deb5839993b8601347be94412d0b0c058084b4dc0d380681f7b4debd535f9736c2ef734e9fd84c6ddc190ab05f46abcb711225ec1f156a18d8edb6317fb SHA512 99163a104e436dab4779c77519502b5614b65d726324b29b14236315f6916beb5863fcd56b5acf19f62985c033b227fba1ebd3d3c4607ce991d94ee7739bb55f
DIST sundials-5.7.0.tar.gz 22612286 BLAKE2B a21db0d07b8f2056ba244ca52f13bde51a2f745535c7381a4eecf9d8037df3d50f010c8fecd8e37d71150f101c8177b2e3f0ffbed8139702993e01b8ad52e707 SHA512 5e2b6145fdaa72e7d13f43e75e5bc08b9d7eb5b9e048207d5772ddab767e198af5be24b73a942a564a49d56ca0b47fe6493bd2de34a8a93948ccd1c13e5dd170
+DIST sundials-5.8.0.tar.gz 24012815 BLAKE2B f707ad7465218532f3dc4df7627b87933b2bc52be6f1ad290b91ab83a3414ae83bc64503126af8772daa000f58a89855d7ca35fe74fa21bd91180695582442c7 SHA512 d22e699aaddaeef026e91e18dd070d06278c75b6980b36c6fb2e50203ba6445420e4a8e0612a6317dcaa521aeffbdf62ab88737be235ef70cef3a8be02a13dbb
diff --git a/sci-libs/sundials/files/sundials-5.8.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.8.0-fix-license-install-path.patch
new file mode 100644
index 00000000000..d4e5fd929b3
--- /dev/null
+++ b/sci-libs/sundials/files/sundials-5.8.0-fix-license-install-path.patch
@@ -0,0 +1,29 @@
+From 554a760daeda3a04049bfa4cf882aae1207f833d Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 30 Apr 2021 11:58:25 +0200
+Subject: [PATCH] fix license install path
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 40a650e..d57ca7b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -231,10 +231,10 @@ endif()
+
+ # install license and notice files
+ install(FILES "${PROJECT_SOURCE_DIR}/LICENSE"
+- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sundials"
++ DESTINATION "${CMAKE_INSTALL_DOCDIR}"
+ )
+ install(FILES "${PROJECT_SOURCE_DIR}/NOTICE"
+- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sundials"
++ DESTINATION "${CMAKE_INSTALL_DOCDIR}"
+ )
+
+ # create package version file
+--
+2.31.1
diff --git a/sci-libs/sundials/sundials-5.8.0.ebuild b/sci-libs/sundials/sundials-5.8.0.ebuild
new file mode 100644
index 00000000000..894e7ef201c
--- /dev/null
+++ b/sci-libs/sundials/sundials-5.8.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD="77 90 2003"
+# if FFLAGS and FCFLAGS are set then should be equal
+
+inherit cmake flag-o-matic fortran-2 toolchain-funcs
+
+DESCRIPTION="Suite of nonlinear solvers"
+HOMEPAGE="https://computation.llnl.gov/projects/sundials"
+SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples fortran hypre lapack mpi openmp sparse +static-libs superlumt threads"
+REQUIRED_USE="
+ fortran? ( static-libs )
+ hypre? ( mpi )
+"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ lapack? ( virtual/lapack )
+ mpi? (
+ sci-libs/hypre:=[fortran?,mpi?]
+ virtual/mpi[fortran?]
+ )
+ sparse? ( sci-libs/klu )
+ superlumt? ( sci-libs/superlu_mt:= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-license-install-path.patch
+)
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+ ewarn "OpenMP is not available in your current selected gcc"
+ die "need openmp capable gcc"
+ fi
+}
+
+src_prepare() {
+ # bug #707240
+ append-cflags -fcommon
+ use threads && append-ldflags -pthread
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ mycmakeargs+=(
+ -DBUILD_FORTRAN77_INTERFACE=$(usex fortran)
+ -DBUILD_FORTRAN_MODULE_INTERFACE=$(usex fortran)
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_STATIC_LIBS=$(usex static-libs)
+ -DENABLE_HYPRE=$(usex hypre)
+ -DENABLE_KLU=$(usex sparse)
+ -DENABLE_LAPACK=$(usex lapack)
+ -DENABLE_MPI=$(usex mpi)
+ -DENABLE_OPENMP=$(usex openmp)
+ -DENABLE_PTHREAD=$(usex threads)
+ -DENABLE_SUPERLUMT=$(usex superlumt)
+ -DEXAMPLES_INSTALL=ON
+ -DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+ -DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
+ -DSUPERLUMT_LIBRARY="-lsuperlu_mt"
+ -DUSE_GENERIC_MATH=ON
+ )
+ if use examples; then
+ mycmakeargs+=(
+ -DEXAMPLES_ENABLE_C=ON
+ -DEXAMPLES_ENABLE_CXX=ON
+ )
+ if use fortran; then
+ mycmakeargs+=(
+ -DEXAMPLES_ENABLE_F77=ON
+ -DEXAMPLES_ENABLE_F90=ON
+ -DEXAMPLES_ENABLE_F2003=ON
+ )
+ fi
+ fi
+
+ if use fortran; then
+ mycmakeargs+=(
+ -DFortran_INSTALL_MODDIR="${EPREFIX}/usr/$(get_libdir)/fortran"
+ )
+ fi
+
+ if use hypre; then
+ mycmakeargs+=(
+ -DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
+ -DHYPRE_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libHYPRE.so"
+ )
+ fi
+
+ if use sparse; then
+ mycmakeargs+=(
+ -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
+ )
+ fi
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ use doc && dodoc doc/*/*.pdf
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/sundials/files/, sci-libs/sundials/
@ 2022-12-24 14:01 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2022-12-24 14:01 UTC (permalink / raw
To: gentoo-commits
commit: 891f1ee8e6fd6c8576a274d836e18fd259651265
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 11:37:25 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 14:00:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=891f1ee8
sci-libs/sundials: drop 5.2.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/sundials/Manifest | 1 -
.../sundials-5.2.0-fix-license-install-path.patch | 15 ----
sci-libs/sundials/sundials-5.2.0.ebuild | 79 ----------------------
3 files changed, 95 deletions(-)
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index dc11161c3fdd..e9bc6740cff3 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -1,3 +1,2 @@
-DIST sundials-5.2.0.tar.gz 18639221 BLAKE2B c10e6deb5839993b8601347be94412d0b0c058084b4dc0d380681f7b4debd535f9736c2ef734e9fd84c6ddc190ab05f46abcb711225ec1f156a18d8edb6317fb SHA512 99163a104e436dab4779c77519502b5614b65d726324b29b14236315f6916beb5863fcd56b5acf19f62985c033b227fba1ebd3d3c4607ce991d94ee7739bb55f
DIST sundials-5.8.0.tar.gz 24012815 BLAKE2B f707ad7465218532f3dc4df7627b87933b2bc52be6f1ad290b91ab83a3414ae83bc64503126af8772daa000f58a89855d7ca35fe74fa21bd91180695582442c7 SHA512 d22e699aaddaeef026e91e18dd070d06278c75b6980b36c6fb2e50203ba6445420e4a8e0612a6317dcaa521aeffbdf62ab88737be235ef70cef3a8be02a13dbb
DIST sundials-6.2.0.tar.gz 82410068 BLAKE2B c6aa9735198465bb458590ef1a90101e246202632afd6bd7f48970b9a2752810ce8c5be7983097cd816189cb994efbddf8d34706665846c67d6442bd7c12db38 SHA512 0dd0a2bf6390a13a5846caf440aa6d459f3890f6d13c0eff8c8180a92a636d6eae7f64679d45acd2048de742d4c644e2ae112cb09028b3fdef10a247bee44c0b
diff --git a/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch
deleted file mode 100644
index 8fb6c977ca76..000000000000
--- a/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2020-04-01 00:03:37.000000000 +0300
-+++ b/CMakeLists.txt 2020-04-21 13:27:58.000000000 +0300
-@@ -1146,9 +1146,9 @@
- # install license and notice files
- install(
- FILES ${PROJECT_SOURCE_DIR}/LICENSE
-- DESTINATION include/sundials
-+ DESTINATION share/doc/sundials-5.2.0
- )
- install(
- FILES ${PROJECT_SOURCE_DIR}/NOTICE
-- DESTINATION include/sundials
-+ DESTINATION share/doc/sundials-5.2.0
- )
diff --git a/sci-libs/sundials/sundials-5.2.0.ebuild b/sci-libs/sundials/sundials-5.2.0.ebuild
deleted file mode 100644
index 5af24cd4ed75..000000000000
--- a/sci-libs/sundials/sundials-5.2.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD="77 90"
-# if FFLAGS and FCFLAGS are set then should be equal
-
-inherit cmake fortran-2 toolchain-funcs flag-o-matic
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
- lapack? ( virtual/lapack )
- mpi? ( virtual/mpi sci-libs/hypre:= )
- sparse? ( sci-libs/klu )
- superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
- # bug #707240
- append-cflags -fcommon
-
- cmake_src_prepare
-}
-
-src_configure() {
- mycmakeargs+=(
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_STATIC_LIBS="$(usex static-libs)"
- -DCXX_ENABLE="$(usex cxx)"
- -DFCMIX_ENABLE="$(usex fortran)"
- -DF90_ENABLE="$(usex fortran)"
- -DHYPRE_ENABLE="$(usex hypre)"
- -DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
- -DKLU_ENABLE="$(usex sparse)"
- -DLAPACK_ENABLE="$(usex lapack)"
- -DMPI_ENABLE="$(usex mpi)"
- -DOPENMP_ENABLE="$(usex openmp)"
- -DPTHREAD_ENABLE="$(usex threads)"
- -DSUPERLUMT_ENABLE="$(usex superlumt)"
- -DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
- -DSUPERLUMT_LIBRARY="-lsuperlu_mt"
- -DEXAMPLES_ENABLE="$(usex examples)"
- -DEXAMPLES_INSTALL=ON
- -DEXAMPLES_INSTALL_PATH="${EPREFIX}/usr/share/doc/${PF}/examples"
- -DUSE_GENERIC_MATH=ON
- )
- use sparse && mycmakeargs+=( -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so" )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- use doc && dodoc doc/*/*.pdf
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/sundials/files/, sci-libs/sundials/
@ 2023-05-14 10:29 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2023-05-14 10:29 UTC (permalink / raw
To: gentoo-commits
commit: 336d4daf6661c9af302c3316b9332f8d5db854c7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 07:42:26 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 14 10:27:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=336d4daf
sci-libs/sundials: drop 5.2.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/sundials/Manifest | 1 -
.../sundials-5.2.0-fix-license-install-path.patch | 15 ----
sci-libs/sundials/sundials-5.2.0.ebuild | 79 ----------------------
3 files changed, 95 deletions(-)
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index 8347f91d2451..dc635448d6f7 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -1,4 +1,3 @@
-DIST sundials-5.2.0.tar.gz 18639221 BLAKE2B c10e6deb5839993b8601347be94412d0b0c058084b4dc0d380681f7b4debd535f9736c2ef734e9fd84c6ddc190ab05f46abcb711225ec1f156a18d8edb6317fb SHA512 99163a104e436dab4779c77519502b5614b65d726324b29b14236315f6916beb5863fcd56b5acf19f62985c033b227fba1ebd3d3c4607ce991d94ee7739bb55f
DIST sundials-5.8.0.tar.gz 24012815 BLAKE2B f707ad7465218532f3dc4df7627b87933b2bc52be6f1ad290b91ab83a3414ae83bc64503126af8772daa000f58a89855d7ca35fe74fa21bd91180695582442c7 SHA512 d22e699aaddaeef026e91e18dd070d06278c75b6980b36c6fb2e50203ba6445420e4a8e0612a6317dcaa521aeffbdf62ab88737be235ef70cef3a8be02a13dbb
DIST sundials-6.2.0.tar.gz 82410068 BLAKE2B c6aa9735198465bb458590ef1a90101e246202632afd6bd7f48970b9a2752810ce8c5be7983097cd816189cb994efbddf8d34706665846c67d6442bd7c12db38 SHA512 0dd0a2bf6390a13a5846caf440aa6d459f3890f6d13c0eff8c8180a92a636d6eae7f64679d45acd2048de742d4c644e2ae112cb09028b3fdef10a247bee44c0b
DIST sundials-6.5.0.tar.gz 89142911 BLAKE2B 3605686f813928fe55e5aafd409c478cf782411b5d2e510121fe15cc15eae84a5d0fe7470c7c0c976fbe11e7f0fd0e9fb449ae45b4c34aa077ac1acb25255cf5 SHA512 30ad3d3f998df6a6381a14b0c8fe247a5507e386ed1b9b55afae87b976f15026d7b4e8609c3cf8423ad79e1b55bade40dc66b274dc3422e040cb12fec981d502
diff --git a/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch
deleted file mode 100644
index 8fb6c977ca76..000000000000
--- a/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2020-04-01 00:03:37.000000000 +0300
-+++ b/CMakeLists.txt 2020-04-21 13:27:58.000000000 +0300
-@@ -1146,9 +1146,9 @@
- # install license and notice files
- install(
- FILES ${PROJECT_SOURCE_DIR}/LICENSE
-- DESTINATION include/sundials
-+ DESTINATION share/doc/sundials-5.2.0
- )
- install(
- FILES ${PROJECT_SOURCE_DIR}/NOTICE
-- DESTINATION include/sundials
-+ DESTINATION share/doc/sundials-5.2.0
- )
diff --git a/sci-libs/sundials/sundials-5.2.0.ebuild b/sci-libs/sundials/sundials-5.2.0.ebuild
deleted file mode 100644
index 5af24cd4ed75..000000000000
--- a/sci-libs/sundials/sundials-5.2.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD="77 90"
-# if FFLAGS and FCFLAGS are set then should be equal
-
-inherit cmake fortran-2 toolchain-funcs flag-o-matic
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
- lapack? ( virtual/lapack )
- mpi? ( virtual/mpi sci-libs/hypre:= )
- sparse? ( sci-libs/klu )
- superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
- # bug #707240
- append-cflags -fcommon
-
- cmake_src_prepare
-}
-
-src_configure() {
- mycmakeargs+=(
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_STATIC_LIBS="$(usex static-libs)"
- -DCXX_ENABLE="$(usex cxx)"
- -DFCMIX_ENABLE="$(usex fortran)"
- -DF90_ENABLE="$(usex fortran)"
- -DHYPRE_ENABLE="$(usex hypre)"
- -DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
- -DKLU_ENABLE="$(usex sparse)"
- -DLAPACK_ENABLE="$(usex lapack)"
- -DMPI_ENABLE="$(usex mpi)"
- -DOPENMP_ENABLE="$(usex openmp)"
- -DPTHREAD_ENABLE="$(usex threads)"
- -DSUPERLUMT_ENABLE="$(usex superlumt)"
- -DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
- -DSUPERLUMT_LIBRARY="-lsuperlu_mt"
- -DEXAMPLES_ENABLE="$(usex examples)"
- -DEXAMPLES_INSTALL=ON
- -DEXAMPLES_INSTALL_PATH="${EPREFIX}/usr/share/doc/${PF}/examples"
- -DUSE_GENERIC_MATH=ON
- )
- use sparse && mycmakeargs+=( -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so" )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- use doc && dodoc doc/*/*.pdf
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-05-14 10:29 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-24 14:01 [gentoo-commits] repo/gentoo:master commit in: sci-libs/sundials/files/, sci-libs/sundials/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-05-14 10:29 Andreas Sturmlechner
2021-10-04 19:33 Jakov Smolić
2021-01-31 20:37 David Seifert
2020-05-05 16:54 Matthias Maier
2020-03-05 12:21 Joonas Niilola
2019-12-24 14:47 Matthias Maier
2019-07-30 15:12 Matthias Maier
2019-07-15 21:35 Matthias Maier
2019-07-15 21:35 Matthias Maier
2017-01-02 16:13 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox