[gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/files/, sci-libs/trilinos/
commit: d7367338b1cf7b5d6a8a5344755564145875d195
Author: Matthias Maier gentoo org>
AuthorDate: Tue Apr 2 14:24:38 2019 +
Commit: Matthias Maier gentoo org>
CommitDate: Thu Apr 4 03:57:51 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d7367338
sci-libs/trilinos: version bump to 12.14.1
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Matthias Maier gentoo.org>
...nos-12.14.1-fix_install_paths_for_destdir.patch | 973 +
sci-libs/trilinos/trilinos-12.12.1-r1.ebuild | 2 +-
...s-12.12.1-r1.ebuild => trilinos-12.14.1.ebuild} | 14 +-
3 files changed, 981 insertions(+), 8 deletions(-)
diff --git
a/sci-libs/trilinos/files/trilinos-12.14.1-fix_install_paths_for_destdir.patch
b/sci-libs/trilinos/files/trilinos-12.14.1-fix_install_paths_for_destdir.patch
new file mode 100644
index 0..c59d278ca
--- /dev/null
+++
b/sci-libs/trilinos/files/trilinos-12.14.1-fix_install_paths_for_destdir.patch
@@ -0,0 +1,973 @@
+diff --git a/cmake/tribits/examples/tpls/SimpleTpl/CMakeLists.txt
b/cmake/tribits/examples/tpls/SimpleTpl/CMakeLists.txt
+index e95f4289..e1244b48 100644
+--- a/cmake/tribits/examples/tpls/SimpleTpl/CMakeLists.txt
b/cmake/tribits/examples/tpls/SimpleTpl/CMakeLists.txt
+@@ -4,12 +4,12 @@ ADD_LIBRARY(simpletpl SimpleTpl.hpp SimpleTpl.cpp)
+
+ INSTALL(
+ TARGETS simpletpl
+- RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/lib"
+- LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib"
++ RUNTIME DESTINATION "lib"
++ LIBRARY DESTINATION "lib"
++ ARCHIVE DESTINATION "lib"
+ )
+
+ INSTALL(
+ FILES SimpleTpl.hpp
+- DESTINATION "${CMAKE_INSTALL_PREFIX}/include"
++ DESTINATION "include"
+ )
+diff --git a/commonTools/gtest/CMakeLists.txt
b/commonTools/gtest/CMakeLists.txt
+index 35075d69..563955e8 100644
+--- a/commonTools/gtest/CMakeLists.txt
b/commonTools/gtest/CMakeLists.txt
+@@ -34,7 +34,7 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ #install gtest header into the correct subdir.
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${Trilinos_INSTALL_INCLUDE_DIR}/gtest/)
++INSTALL(FILES ${HEADERS} DESTINATION ${Trilinos_INSTALL_INCLUDE_DIR}/gtest/)
+
+ #
+ # D) Do standard postprocessing
+diff --git a/packages/intrepid2/src/CMakeLists.txt
b/packages/intrepid2/src/CMakeLists.txt
+index c01d0081..65830941 100644
+--- a/packages/intrepid2/src/CMakeLists.txt
b/packages/intrepid2/src/CMakeLists.txt
+@@ -4,7 +4,7 @@
+
+ TRIBITS_CONFIGURE_FILE(Intrepid2_config.h)
+
+-SET(TRILINOS_INCDIR
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ #
+ # B) Define the header and source files (and directories)
+diff --git a/packages/kokkos-kernels/src/CMakeLists.txt
b/packages/kokkos-kernels/src/CMakeLists.txt
+index da6afef5..06375151 100644
+--- a/packages/kokkos-kernels/src/CMakeLists.txt
b/packages/kokkos-kernels/src/CMakeLists.txt
+@@ -4,7 +4,7 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+-SET(TRILINOS_INCDIR
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ #-
+
+diff --git a/packages/kokkos/containers/src/CMakeLists.txt
b/packages/kokkos/containers/src/CMakeLists.txt
+index e68fcad5..289d23bf 100644
+--- a/packages/kokkos/containers/src/CMakeLists.txt
b/packages/kokkos/containers/src/CMakeLists.txt
+@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+ #-
+
+-SET(TRILINOS_INCDIR
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ if(KOKKOS_LEGACY_TRIBITS)
+
+diff --git a/packages/kokkos/core/src/CMakeLists.txt
b/packages/kokkos/core/src/CMakeLists.txt
+index eb026167..2722d810 100644
+--- a/packages/kokkos/core/src/CMakeLists.txt
b/packages/kokkos/core/src/CMakeLists.txt
+@@ -5,7 +5,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+ #-
+
+-SET(TRILINOS_INCDIR
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ #-
+
+diff --git a/packages/kokkos/core/src/impl/CMakeLists.txt
b/packages/kokkos/core/src/impl/CMakeLists.txt
+index c543194d..1021f421 100644
+--- a/packages/kokkos/core/src/impl/CMakeLists.txt
b/packages/kokkos/core/src/impl/CMakeLists.txt
+@@ -12,7 +12,7 @@ TRIBITS_ADD_LIBRARY(
+ DEPLIBS
+ )
+
+-SET(TRILINOS_INCDIR
[gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/files/, sci-libs/trilinos/
commit: 71b61b6baebd6d93da9ed756a136a325828ecce8
Author: Matthias Maier gentoo org>
AuthorDate: Wed Feb 28 17:26:41 2018 +
Commit: Matthias Maier gentoo org>
CommitDate: Thu Mar 1 20:18:14 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=71b61b6b
sci-libs/trilinos: version bump to 12.12.1
Package-Manager: Portage-2.3.24, Repoman-2.3.6
...nos-12.12.1-fix_install_paths_for_destdir.patch | 1069
...trilinos-12.12.1-fix_sundance_compilation.patch | 33 +
sci-libs/trilinos/trilinos-12.12.1.ebuild | 207
3 files changed, 1309 insertions(+)
diff --git
a/sci-libs/trilinos/files/trilinos-12.12.1-fix_install_paths_for_destdir.patch
b/sci-libs/trilinos/files/trilinos-12.12.1-fix_install_paths_for_destdir.patch
new file mode 100644
index 0..d4e04a438
--- /dev/null
+++
b/sci-libs/trilinos/files/trilinos-12.12.1-fix_install_paths_for_destdir.patch
@@ -0,0 +1,1069 @@
+diff --git a/commonTools/gtest/CMakeLists.txt
b/commonTools/gtest/CMakeLists.txt
+index 4b96030..34aef5f 100644
+--- a/commonTools/gtest/CMakeLists.txt
b/commonTools/gtest/CMakeLists.txt
+@@ -36,7 +36,7 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ #install gtest header into the correct subdir.
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${Trilinos_INSTALL_INCLUDE_DIR}/gtest/)
++INSTALL(FILES ${HEADERS} DESTINATION ${Trilinos_INSTALL_INCLUDE_DIR}/gtest/)
+
+
+
+diff --git a/packages/rol/adapters/arrayfire/src/CMakeLists.txt
b/packages/rol/adapters/arrayfire/src/CMakeLists.txt
+index 2c6b4b0..6184d3d 100644
+--- a/packages/rol/adapters/arrayfire/src/CMakeLists.txt
b/packages/rol/adapters/arrayfire/src/CMakeLists.txt
+@@ -36,4 +36,4 @@ IF (ROL_ENABLE_ArrayFireCPU)
+ )
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/belos/src/CMakeLists.txt
b/packages/rol/adapters/belos/src/CMakeLists.txt
+index 109f28e..3749b75 100644
+--- a/packages/rol/adapters/belos/src/CMakeLists.txt
b/packages/rol/adapters/belos/src/CMakeLists.txt
+@@ -39,4 +39,4 @@ IF (ROL_ENABLE_Belos)
+ )
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/epetra/src/CMakeLists.txt
b/packages/rol/adapters/epetra/src/CMakeLists.txt
+index f2b329b..d96b18d 100644
+--- a/packages/rol/adapters/epetra/src/CMakeLists.txt
b/packages/rol/adapters/epetra/src/CMakeLists.txt
+@@ -42,4 +42,4 @@ IF (ROL_ENABLE_Epetra)
+ )
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/minitensor/src/CMakeLists.txt
b/packages/rol/adapters/minitensor/src/CMakeLists.txt
+index 0da2642..d91a4a7 100644
+--- a/packages/rol/adapters/minitensor/src/CMakeLists.txt
b/packages/rol/adapters/minitensor/src/CMakeLists.txt
+@@ -67,4 +67,4 @@ IF (ROL_ENABLE_Boost AND ROL_ENABLE_MiniTensor)
+ )
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/sacado/src/CMakeLists.txt
b/packages/rol/adapters/sacado/src/CMakeLists.txt
+index 1ac1a19..a808d63 100644
+--- a/packages/rol/adapters/sacado/src/CMakeLists.txt
b/packages/rol/adapters/sacado/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ IF (ROL_ENABLE_Sacado)
+ )
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/teuchos/src/CMakeLists.txt
b/packages/rol/adapters/teuchos/src/CMakeLists.txt
+index 802760c..34aae17 100644
+--- a/packages/rol/adapters/teuchos/src/CMakeLists.txt
b/packages/rol/adapters/teuchos/src/CMakeLists.txt
+@@ -42,4 +42,4 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/function)
+ )
+
+
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/thyra/src/CMakeLists.txt
b/packages/rol/adapters/thyra/src/CMakeLists.txt
+index 725cad8..357e799 100644
+--- a/packages/rol/adapters/thyra/src/CMakeLists.txt
b/packages/rol/adapters/thyra/src/CMakeLists.txt
+@@ -49,4 +49,4 @@ IF (ROL_ENABLE_Thyra)
+ )
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION
[gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/files/, sci-libs/trilinos/
commit: 38595d3ace6adaa1b66b6641598eb4dfcd9ae94b
Author: Matthias Maier gentoo org>
AuthorDate: Wed Feb 28 17:29:10 2018 +
Commit: Matthias Maier gentoo org>
CommitDate: Thu Mar 1 20:18:27 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=38595d3a
sci-libs/trilinos: drop old versions
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../files/trilinos-11.12.1-fix-install-paths.patch | 61 --
.../files/trilinos-11.4.2-fix-install-paths.patch | 60 --
...inos-12.0.1-fix_install_paths_for_destdir.patch | 654 -
.../files/trilinos-12.2.1-compilation_fixes.patch | 43 --
...inos-12.6.2-fix_install_paths_for_destdir.patch | 652
sci-libs/trilinos/trilinos-12.0.1.ebuild | 207 ---
sci-libs/trilinos/trilinos-12.2.1.ebuild | 208 ---
sci-libs/trilinos/trilinos-12.6.3.ebuild | 207 ---
sci-libs/trilinos/trilinos-12.6.4.ebuild | 207 ---
9 files changed, 2299 deletions(-)
diff --git a/sci-libs/trilinos/files/trilinos-11.12.1-fix-install-paths.patch
b/sci-libs/trilinos/files/trilinos-11.12.1-fix-install-paths.patch
deleted file mode 100644
index 9a0229239..0
--- a/sci-libs/trilinos/files/trilinos-11.12.1-fix-install-paths.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake
b/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake
-index e1c633f..864488f 100644
a/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake
-+++ b/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake
-@@ -494,8 +494,8 @@
INCLUDE(\"${PROJECT_BINARY_DIR}/${PACKAGE_NAME}Targets.cmake\")"
- FOREACH(PATH ${PATH_LIST})
- SET(RELATIVE_PATH "${RELATIVE_PATH}/..")
- ENDFOREACH()
-- SET(FULL_LIBRARY_DIRS_SET
"\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_LIB_DIR}")
-- SET(FULL_INCLUDE_DIRS_SET
"\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
-+ SET(FULL_LIBRARY_DIRS_SET "${${PROJECT_NAME}_INSTALL_LIB_DIR}")
-+ SET(FULL_INCLUDE_DIRS_SET "${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
-
- # Custom code in configuration file.
- SET(PACKAGE_CONFIG_CODE "")
-@@ -574,14 +574,14 @@
FUNCTION(TRIBITS_WRITE_PROJECT_CLIENT_EXPORT_FILES_INSTALL_TARGETS PACKAGE_NAME)
- IF (${PROJECT_NAME}_ENABLE_INSTALL_CMAKE_CONFIG_FILES)
- INSTALL(
- FILES
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PACKAGE_NAME}Config_install.cmake
-- DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}"
-+ DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}"
- RENAME ${PACKAGE_NAME}Config.cmake
- )
-
- IF(${PACKAGE_NAME}_HAS_NATIVE_LIBRARIES)
- INSTALL(
- EXPORT ${PACKAGE_NAME}
--DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}"
-+DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}"
- FILE ${PACKAGE_NAME}Targets.cmake
- )
- ENDIF()
-@@ -819,8 +819,8 @@
include(\"${${TRIBITS_PACKAGE}_BINARY_DIR}/${TRIBITS_PACKAGE}Config.cmake\")")
- FOREACH(PATH ${PATH_LIST})
- SET(RELATIVE_PATH "${RELATIVE_PATH}/..")
- ENDFOREACH()
-- SET(${PROJECT_NAME}_CONFIG_INCLUDE_DIRS
"\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
-- SET(${PROJECT_NAME}_CONFIG_LIBRARY_DIRS
"\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_LIB_DIR}")
-+ SET(${PROJECT_NAME}_CONFIG_INCLUDE_DIRS
"${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
-+ SET(${PROJECT_NAME}_CONFIG_LIBRARY_DIRS
"${${PROJECT_NAME}_INSTALL_LIB_DIR}")
-
- # Write the specification of the rpath if necessary. This is only needed if
we're building shared libraries.
- IF(BUILD_SHARED_LIBS)
-@@ -845,7 +845,7 @@
include(\"\${CMAKE_CURRENT_LIST_DIR}/../${TRIBITS_PACKAGE}/${TRIBITS_PACKAGE}Con
-
- INSTALL(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config_install.cmake
-- DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}"
-+ DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}"
- RENAME ${PROJECT_NAME}Config.cmake
- )
- ENDIF()
-@@ -890,7 +890,7 @@
include(\"\${CMAKE_CURRENT_LIST_DIR}/../${TRIBITS_PACKAGE}/${TRIBITS_PACKAGE}Con
- )
- INSTALL(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
--DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}"
-+DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}"
- )
-
- ENDFUNCTION()
diff --git a/sci-libs/trilinos/files/trilinos-11.4.2-fix-install-paths.patch
b/sci-libs/trilinos/files/trilinos-11.4.2-fix-install-paths.patch
deleted file mode 100644
index a9c222e0e..0
--- a/sci-libs/trilinos/files/trilinos-11.4.2-fix-install-paths.patch
+++ /dev/null
@@ -1,60 +0,0 @@
[gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/files/, sci-libs/trilinos/
commit: 9aa67941bf580f2ea9d2e733d82c941d1847b9d0
Author: Matthias Maier gentoo org>
AuthorDate: Sat Jan 14 14:57:28 2017 +
Commit: Justin Lecher gentoo org>
CommitDate: Sat Jan 14 14:57:28 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9aa67941
sci-libs/trilinos: fix installation
Package-Manager: Portage-2.3.0, Repoman-2.3.1
.../trilinos-12.10.1-fix_install_paths_for_destdir-2.patch | 10 ++
sci-libs/trilinos/trilinos-12.10.1.ebuild | 5 +++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git
a/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir-2.patch
b/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir-2.patch
new file mode 100644
index 000..52ddc76
--- /dev/null
+++
b/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir-2.patch
@@ -0,0 +1,10 @@
+diff --git a/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt
b/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt
+index 8f9fa8f..e57d25f 100644
+--- a/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt
b/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt
+@@ -71,4 +71,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
diff --git a/sci-libs/trilinos/trilinos-12.10.1.ebuild
b/sci-libs/trilinos/trilinos-12.10.1.ebuild
index 878ea8f..c00a3ef 100644
--- a/sci-libs/trilinos/trilinos-12.10.1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -84,7 +84,8 @@ trilinos_enable() {
src_prepare() {
epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch \
- "${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch
+ "${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch \
+ "${FILESDIR}"/${P}-fix_install_paths_for_destdir-2.patch
}
src_configure() {
[gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/files/, sci-libs/trilinos/
commit: 24b0bf330b0a38d5dbc96c0356ae93406d31f33b
Author: Christoph Junghans gentoo org>
AuthorDate: Tue Dec 6 19:44:09 2016 +
Commit: Christoph Junghans gentoo org>
CommitDate: Tue Dec 6 19:44:26 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=24b0bf33
sci-libs/trilinos: version bump
Package-Manager: portage-2.3.0
...nos-12.10.1-fix_install_paths_for_destdir.patch | 603 +
sci-libs/trilinos/trilinos-12.10.1.ebuild | 210 +++
2 files changed, 813 insertions(+)
diff --git
a/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir.patch
b/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir.patch
new file mode 100644
index 000..2e8960e
--- /dev/null
+++
b/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir.patch
@@ -0,0 +1,603 @@
+diff -Naur trilinos-12.10.1-Source.orig/commonTools/gtest/CMakeLists.txt
trilinos-12.10.1-Source/commonTools/gtest/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/commonTools/gtest/CMakeLists.txt
2016-12-05 13:46:36.981584433 -0700
trilinos-12.10.1-Source/commonTools/gtest/CMakeLists.txt 2016-12-05
13:53:32.265171949 -0700
+@@ -31,7 +31,7 @@
+ )
+
+ #install gtest header into the correct subdir.
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${Trilinos_INSTALL_INCLUDE_DIR}/gtest/)
++INSTALL(FILES ${HEADERS} DESTINATION ${Trilinos_INSTALL_INCLUDE_DIR}/gtest/)
+
+
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/kokkos/containers/src/CMakeLists.txt
trilinos-12.10.1-Source/packages/kokkos/containers/src/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/kokkos/containers/src/CMakeLists.txt
2016-12-05 13:46:37.071535392 -0700
trilinos-12.10.1-Source/packages/kokkos/containers/src/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -15,7 +15,7 @@
+ FILE(GLOB HEADERS_IMPL impl/*.hpp)
+ FILE(GLOB SOURCES impl/*.cpp)
+
+-SET(TRILINOS_INCDIR
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ INSTALL(FILES ${HEADERS_IMPL} DESTINATION ${TRILINOS_INCDIR}/impl/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/kokkos/core/src/CMakeLists.txt
trilinos-12.10.1-Source/packages/kokkos/core/src/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/kokkos/core/src/CMakeLists.txt
2016-12-05 13:46:37.061540841 -0700
trilinos-12.10.1-Source/packages/kokkos/core/src/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -40,7 +40,7 @@
+
+ #-
+
+-SET(TRILINOS_INCDIR
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ #-
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/kokkos/core/src/impl/CMakeLists.txt
trilinos-12.10.1-Source/packages/kokkos/core/src/impl/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/kokkos/core/src/impl/CMakeLists.txt
2016-12-05 13:46:37.061540841 -0700
trilinos-12.10.1-Source/packages/kokkos/core/src/impl/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -12,7 +12,7 @@
+ DEPLIBS
+ )
+
+-SET(TRILINOS_INCDIR
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/impl/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/rol/adapters/belos/src/CMakeLists.txt
trilinos-12.10.1-Source/packages/rol/adapters/belos/src/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/rol/adapters/belos/src/CMakeLists.txt
2016-12-05 13:46:37.111513596 -0700
trilinos-12.10.1-Source/packages/rol/adapters/belos/src/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -39,4 +39,4 @@
+ )
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff -Naur
trilinos-12.10.1-Source.orig/packages/rol/adapters/epetra/src/CMakeLists.txt
trilinos-12.10.1-Source/packages/rol/adapters/epetra/src/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/rol/adapters/epetra/src/CMakeLists.txt
2016-12-05 13:46:37.111513596 -0700
trilinos-12.10.1-Source/packages/rol/adapters/epetra/src/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -42,4 +42,4 @@
+ )
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff -Naur
trilinos-12.10.1-Source.orig/packages/rol/adapters/sacado/src/CMakeLists.txt
trilinos-12.10.1-Source/packages/rol/adapters/sacado/src/CMakeLists.txt
+---
[gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/files/, sci-libs/trilinos/
commit: ca7ff0c633032cdb2d658335e748ede0a296b5d3
Author: Matthias Maier gentoo org>
AuthorDate: Fri Apr 22 07:01:55 2016 +
Commit: Christoph Junghans gentoo org>
CommitDate: Fri Apr 22 07:01:55 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=ca7ff0c6
sci-libs/trilinos: Version bump to 12.6.2
Package-Manager: portage-2.2.26
...inos-12.6.2-fix_install_paths_for_destdir.patch | 652 +
sci-libs/trilinos/trilinos-12.6.2.ebuild | 207 +++
2 files changed, 859 insertions(+)
diff --git
a/sci-libs/trilinos/files/trilinos-12.6.2-fix_install_paths_for_destdir.patch
b/sci-libs/trilinos/files/trilinos-12.6.2-fix_install_paths_for_destdir.patch
new file mode 100644
index 000..d3556c7
--- /dev/null
+++
b/sci-libs/trilinos/files/trilinos-12.6.2-fix_install_paths_for_destdir.patch
@@ -0,0 +1,652 @@
+diff --git a/commonTools/gtest/CMakeLists.txt
b/commonTools/gtest/CMakeLists.txt
+index 9367010..17f8892 100644
+--- a/commonTools/gtest/CMakeLists.txt
b/commonTools/gtest/CMakeLists.txt
+@@ -31,7 +31,7 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ #install gtest header into the correct subdir.
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${Trilinos_INSTALL_INCLUDE_DIR}/gtest/)
++INSTALL(FILES ${HEADERS} DESTINATION ${Trilinos_INSTALL_INCLUDE_DIR}/gtest/)
+
+
+
+diff --git a/packages/kokkos/containers/src/CMakeLists.txt
b/packages/kokkos/containers/src/CMakeLists.txt
+index da5a791..5693cdc 100644
+--- a/packages/kokkos/containers/src/CMakeLists.txt
b/packages/kokkos/containers/src/CMakeLists.txt
+@@ -15,7 +15,7 @@ FILE(GLOB HEADERS *.hpp)
+ FILE(GLOB HEADERS_IMPL impl/*.hpp)
+ FILE(GLOB SOURCES impl/*.cpp)
+
+-SET(TRILINOS_INCDIR
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ INSTALL(FILES ${HEADERS_IMPL} DESTINATION ${TRILINOS_INCDIR}/impl/)
+
+diff --git a/packages/kokkos/core/src/CMakeLists.txt
b/packages/kokkos/core/src/CMakeLists.txt
+index 807a01e..7169c30 100644
+--- a/packages/kokkos/core/src/CMakeLists.txt
b/packages/kokkos/core/src/CMakeLists.txt
+@@ -40,7 +40,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+ #-
+
+-SET(TRILINOS_INCDIR
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ #-
+
+diff --git a/packages/kokkos/core/src/impl/CMakeLists.txt
b/packages/kokkos/core/src/impl/CMakeLists.txt
+index c543194..f1e57ea 100644
+--- a/packages/kokkos/core/src/impl/CMakeLists.txt
b/packages/kokkos/core/src/impl/CMakeLists.txt
+@@ -12,7 +12,7 @@ TRIBITS_ADD_LIBRARY(
+ DEPLIBS
+ )
+
+-SET(TRILINOS_INCDIR
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/impl/)
+
+diff --git a/packages/rol/adapters/belos/src/CMakeLists.txt
b/packages/rol/adapters/belos/src/CMakeLists.txt
+index 05554af..fdc2681 100644
+--- a/packages/rol/adapters/belos/src/CMakeLists.txt
b/packages/rol/adapters/belos/src/CMakeLists.txt
+@@ -40,4 +40,4 @@ IF (ROL_ENABLE_Belos)
+ )
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/epetra/src/CMakeLists.txt
b/packages/rol/adapters/epetra/src/CMakeLists.txt
+index 016e5ed..c976498 100644
+--- a/packages/rol/adapters/epetra/src/CMakeLists.txt
b/packages/rol/adapters/epetra/src/CMakeLists.txt
+@@ -43,4 +43,4 @@ IF (ROL_ENABLE_Epetra)
+ )
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/sacado/src/CMakeLists.txt
b/packages/rol/adapters/sacado/src/CMakeLists.txt
+index 7366185..c186c70 100644
+--- a/packages/rol/adapters/sacado/src/CMakeLists.txt
b/packages/rol/adapters/sacado/src/CMakeLists.txt
+@@ -38,4 +38,4 @@ IF (ROL_ENABLE_Sacado)
+ )
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/thyra/src/CMakeLists.txt
b/packages/rol/adapters/thyra/src/CMakeLists.txt
+index 32172f2..5956c01 100644
+--- a/packages/rol/adapters/thyra/src/CMakeLists.txt
b/packages/rol/adapters/thyra/src/CMakeLists.txt
+@@ -50,4 +50,4 @@ IF (ROL_ENABLE_Thyra)
+ )
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
[gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/files/, sci-libs/trilinos/
commit: e7fd8c458e11b1763a661bcac3ba631ac8d3b230
Author: Matthias Maier tamiko AT gentoo DOT org
AuthorDate: Mon Jul 13 03:05:30 2015 +
Commit: Jauhien Piatlicki jauhien AT gentoo DOT org
CommitDate: Thu Jul 16 19:43:34 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e7fd8c45
sci-libs/trilinos: drop old; version bump
Package-Manager: portage-2.2.20
sci-libs/trilinos/ChangeLog| 9 +
.../files/trilinos-11.0.3-fix-install-paths.patch | 76 ---
.../files/trilinos-11.2.3-fix-install-paths.patch | 62 --
...inos-12.0.1-fix_install_paths_for_destdir.patch | 654 +
sci-libs/trilinos/trilinos-11.0.3.ebuild | 128
sci-libs/trilinos/trilinos-11.2.3-r1.ebuild| 1 -
...ilinos-11.4.2.ebuild = trilinos-12.0.1.ebuild} | 15 +-
7 files changed, 673 insertions(+), 272 deletions(-)
diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index b773567..f5d1ce5 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,15 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*trilinos-12.0.1 (13 Jul 2015)
+
+ 13 Jul 2015; Matthias Maier tam...@gentoo.org
+ +files/trilinos-12.0.1-fix_install_paths_for_destdir.patch,
+ +trilinos-12.0.1.ebuild, -files/trilinos-11.0.3-fix-install-paths.patch,
+ -files/trilinos-11.2.3-fix-install-paths.patch, -trilinos-11.0.3.ebuild,
+ -trilinos-11.2.3-r1.ebuild, -trilinos-11.4.2.ebuild:
+ sci-libs/trilinos: drop old; version bump
+
*trilinos-11.12.1-r1 (13 Mar 2015)
*trilinos-11.14.1-r1 (13 Mar 2015)
diff --git a/sci-libs/trilinos/files/trilinos-11.0.3-fix-install-paths.patch
b/sci-libs/trilinos/files/trilinos-11.0.3-fix-install-paths.patch
deleted file mode 100644
index 8ec15a4..000
--- a/sci-libs/trilinos/files/trilinos-11.0.3-fix-install-paths.patch
+++ /dev/null
@@ -1,76 +0,0 @@
a/cmake/tribits/package_arch/TribitsGlobalMacros.cmake 2013-04-03
11:00:54.342539245 +0200
-+++ b/cmake/tribits/package_arch/TribitsGlobalMacros.cmake 2013-04-03
11:04:30.283837064 +0200
-@@ -209,26 +209,6 @@
- ADVANCED_SET(${PROJECT_NAME}_LINK_SEARCH_START_STATIC OFF CACHE BOOL
- If on, then the properter LINK_SEARCH_START_STATIC will be added to
all executables. )
- ENDIF()
--
-- ADVANCED_SET(${PROJECT_NAME}_INSTALL_INCLUDE_DIR include
--CACHE PATH
--Location where the headers will be installed. If given as a relative
path, it will be relative to ${CMAKE_INSTALL_PREFIX}. If given as an absolute
path, it will used as such. Default is 'include'
--)
--
-- ADVANCED_SET(${PROJECT_NAME}_INSTALL_LIB_DIR lib
--CACHE PATH
--Location where the libraries will be installed. If given as a relative
path, it will be relative to ${CMAKE_INSTALL_PREFIX}. If given as an absolute
path, it will used as such. Default is 'lib'
--)
--
-- ADVANCED_SET(${PROJECT_NAME}_INSTALL_RUNTIME_DIR bin
--CACHE PATH
--Location where the runtime DLLs and designated programs will be
installed. If given as a relative path, it will be relative to
${CMAKE_INSTALL_PREFIX}. If given as an absolute path, it will used as such.
Default is 'bin'
--)
--
-- ADVANCED_SET(${PROJECT_NAME}_INSTALL_EXAMPLE_DIR example
--CACHE PATH
--Location where assorted examples will be installed. If given as a
relative path, it will be relative to ${CMAKE_INSTALL_PREFIX}. If given as an
absolute path, it will used as such. Default is 'example'
--)
-
- IF (${${PROJECT_NAME}_INSTALL_LIBRARIES_AND_HEADERS_DEFAULT} STREQUAL )
- # Assume the TriBITS project wants to install headers and libraries by
default
a/cmake/tribits/package_arch/TribitsPackageWritePackageConfig.cmake
2012-11-12 14:58:00.0 +0100
-+++ b/cmake/tribits/package_arch/TribitsPackageWritePackageConfig.cmake
2012-11-12 14:42:47.0 +0100
-@@ -367,7 +367,7 @@
-
- INSTALL(
- FILES
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PACKAGE_NAME}Config_install.cmake
--DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}
-+DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}
- RENAME ${PACKAGE_NAME}Config.cmake
- )
-
-@@ -563,7 +563,7 @@
- IF(HAS_INSTALL_TARGETS)
- INSTALL(
- EXPORT ${PROJECT_NAME}
-- DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}
-+ DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}
- FILE ${PROJECT_NAME}Targets.cmake
- )
- # Import the targets in applications.
-@@ -589,7 +589,7 @@
-
- INSTALL(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config_install.cmake
--DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}
-+DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}
- RENAME ${PROJECT_NAME}Config.cmake
- )
-
-@@ -632,7 +632,7 @@
-
- INSTALL(
- FILES
[gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/files/, sci-libs/trilinos/
commit: a4246b91d4554ae5a7fff431084d2fcce0851192
Author: Matthias Maier tamiko AT gentoo DOT org
AuthorDate: Fri Mar 13 16:50:29 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Sat Mar 14 08:21:00 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a4246b91
sci-libs/trilinos: version bump, some preliminary metadata
Package-Manager: portage-2.2.15
sci-libs/trilinos/ChangeLog| 8 +
.../files/trilinos-11.14.1-fix-install-paths.patch | 61 ++
...nos-11.14.1-fix_install_paths_for_destdir.patch | 617 +
sci-libs/trilinos/metadata.xml | 73 +--
sci-libs/trilinos/trilinos-11.14.1.ebuild | 207 +++
5 files changed, 931 insertions(+), 35 deletions(-)
diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index ed2de56..1e694b5 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*trilinos-11.14.1 (13 Mar 2015)
+
+ 13 Mar 2015; Matthias Maier tam...@gentoo.org
+ +files/trilinos-11.14.1-fix-install-paths.patch,
+ +files/trilinos-11.14.1-fix_install_paths_for_destdir.patch,
+ +trilinos-11.14.1.ebuild, metadata.xml:
+ sci-libs/trilinos: version bump, some preliminary metadata
+
19 Feb 2015; Christoph Junghans ott...@gentoo.org trilinos-11.0.3.ebuild,
trilinos-11.10.2.ebuild, trilinos-11.12.1.ebuild, trilinos-11.4.2.ebuild:
BSD/LGPL-2.1 never implies a fetch restriction, updated Manifest
diff --git a/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch
b/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch
new file mode 100644
index 000..acfe4bb
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch
@@ -0,0 +1,61 @@
+diff --git a/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake
b/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake
+index e1c633f..864488f 100644
+--- a/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
b/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
+@@ -494,8 +494,8 @@
INCLUDE(\${PROJECT_BINARY_DIR}/${PACKAGE_NAME}Targets.cmake\)
+ FOREACH(PATH ${PATH_LIST})
+ SET(RELATIVE_PATH ${RELATIVE_PATH}/..)
+ ENDFOREACH()
+- SET(FULL_LIBRARY_DIRS_SET
\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_LIB_DIR})
+- SET(FULL_INCLUDE_DIRS_SET
\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++ SET(FULL_LIBRARY_DIRS_SET ${${PROJECT_NAME}_INSTALL_LIB_DIR})
++ SET(FULL_INCLUDE_DIRS_SET ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ # Custom code in configuration file.
+ SET(PACKAGE_CONFIG_CODE )
+@@ -574,14 +574,14 @@
FUNCTION(TRIBITS_WRITE_PROJECT_CLIENT_EXPORT_FILES_INSTALL_TARGETS PACKAGE_NAME)
+ IF (${PROJECT_NAME}_ENABLE_INSTALL_CMAKE_CONFIG_FILES)
+ INSTALL(
+ FILES
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PACKAGE_NAME}Config_install.cmake
+- DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}
++ DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}
+ RENAME ${PACKAGE_NAME}Config.cmake
+ )
+
+ IF(${PACKAGE_NAME}_HAS_NATIVE_LIBRARIES)
+ INSTALL(
+ EXPORT ${PACKAGE_NAME}
+-DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}
++DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}
+ FILE ${PACKAGE_NAME}Targets.cmake
+ )
+ ENDIF()
+@@ -819,8 +819,8 @@
include(\${${TRIBITS_PACKAGE}_BINARY_DIR}/${TRIBITS_PACKAGE}Config.cmake\))
+ FOREACH(PATH ${PATH_LIST})
+ SET(RELATIVE_PATH ${RELATIVE_PATH}/..)
+ ENDFOREACH()
+- SET(${PROJECT_NAME}_CONFIG_INCLUDE_DIRS
\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+- SET(${PROJECT_NAME}_CONFIG_LIBRARY_DIRS
\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_LIB_DIR})
++ SET(${PROJECT_NAME}_CONFIG_INCLUDE_DIRS
${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++ SET(${PROJECT_NAME}_CONFIG_LIBRARY_DIRS
${${PROJECT_NAME}_INSTALL_LIB_DIR})
+
+ # Write the specification of the rpath if necessary. This is only needed if
we're building shared libraries.
+ IF(BUILD_SHARED_LIBS)
+@@ -845,7 +845,7 @@
include(\\${CMAKE_CURRENT_LIST_DIR}/../${TRIBITS_PACKAGE}/${TRIBITS_PACKAGE}Con
+
+ INSTALL(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config_install.cmake
+- DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}
++ DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}
+ RENAME ${PROJECT_NAME}Config.cmake
+ )
+ ENDIF()
+@@ -890,7 +890,7 @@
include(\\${CMAKE_CURRENT_LIST_DIR}/../${TRIBITS_PACKAGE}/${TRIBITS_PACKAGE}Con
+ )
+ INSTALL(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+-
[gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/files/, sci-libs/trilinos/
commit: 180dda21f7e970e576b6064ac387431056cea33e
Author: Matthias Maier tamiko AT gentoo DOT org
AuthorDate: Sat Dec 6 21:52:06 2014 +
Commit: Christoph Junghans ottxor AT gentoo DOT org
CommitDate: Sat Dec 6 21:52:06 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=180dda21
version bump
Package-Manager: portage-2.2.15
---
sci-libs/trilinos/ChangeLog| 6 +
.../files/trilinos-11.12.1-fix-install-paths.patch | 61 +++
sci-libs/trilinos/trilinos-11.12.1.ebuild | 202 +
3 files changed, 269 insertions(+)
diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index d6c571d..82242b8 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*trilinos-11.12.1 (06 Dec 2014)
+
+ 06 Dec 2014; Matthias Maier tam...@gentoo.org
+ +files/trilinos-11.12.1-fix-install-paths.patch, +trilinos-11.12.1.ebuild:
+ version bump
+
*trilinos-11.10.2 (21 Oct 2014)
21 Oct 2014; Matthias Maier tam...@gentoo.org +trilinos-11.10.2.ebuild,
diff --git a/sci-libs/trilinos/files/trilinos-11.12.1-fix-install-paths.patch
b/sci-libs/trilinos/files/trilinos-11.12.1-fix-install-paths.patch
new file mode 100644
index 000..130f3ce
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-11.12.1-fix-install-paths.patch
@@ -0,0 +1,61 @@
+diff --git a/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake
b/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake
+index e1c633f..864488f 100644
+--- a/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake
b/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake
+@@ -494,8 +494,8 @@
INCLUDE(\${PROJECT_BINARY_DIR}/${PACKAGE_NAME}Targets.cmake\)
+ FOREACH(PATH ${PATH_LIST})
+ SET(RELATIVE_PATH ${RELATIVE_PATH}/..)
+ ENDFOREACH()
+- SET(FULL_LIBRARY_DIRS_SET
\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_LIB_DIR})
+- SET(FULL_INCLUDE_DIRS_SET
\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++ SET(FULL_LIBRARY_DIRS_SET ${${PROJECT_NAME}_INSTALL_LIB_DIR})
++ SET(FULL_INCLUDE_DIRS_SET ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ # Custom code in configuration file.
+ SET(PACKAGE_CONFIG_CODE )
+@@ -574,14 +574,14 @@
FUNCTION(TRIBITS_WRITE_PROJECT_CLIENT_EXPORT_FILES_INSTALL_TARGETS PACKAGE_NAME)
+ IF (${PROJECT_NAME}_ENABLE_INSTALL_CMAKE_CONFIG_FILES)
+ INSTALL(
+ FILES
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PACKAGE_NAME}Config_install.cmake
+- DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}
++ DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}
+ RENAME ${PACKAGE_NAME}Config.cmake
+ )
+
+ IF(${PACKAGE_NAME}_HAS_NATIVE_LIBRARIES)
+ INSTALL(
+ EXPORT ${PACKAGE_NAME}
+-DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}
++DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}
+ FILE ${PACKAGE_NAME}Targets.cmake
+ )
+ ENDIF()
+@@ -819,8 +819,8 @@
include(\${${TRIBITS_PACKAGE}_BINARY_DIR}/${TRIBITS_PACKAGE}Config.cmake\))
+ FOREACH(PATH ${PATH_LIST})
+ SET(RELATIVE_PATH ${RELATIVE_PATH}/..)
+ ENDFOREACH()
+- SET(${PROJECT_NAME}_CONFIG_INCLUDE_DIRS
\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+- SET(${PROJECT_NAME}_CONFIG_LIBRARY_DIRS
\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_LIB_DIR})
++ SET(${PROJECT_NAME}_CONFIG_INCLUDE_DIRS
${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++ SET(${PROJECT_NAME}_CONFIG_LIBRARY_DIRS
${${PROJECT_NAME}_INSTALL_LIB_DIR})
+
+ # Write the specification of the rpath if necessary. This is only needed if
we're building shared libraries.
+ IF(BUILD_SHARED_LIBS)
+@@ -845,7 +845,7 @@
include(\\${CMAKE_CURRENT_LIST_DIR}/../${TRIBITS_PACKAGE}/${TRIBITS_PACKAGE}Con
+
+ INSTALL(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config_install.cmake
+- DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}
++ DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}
+ RENAME ${PROJECT_NAME}Config.cmake
+ )
+ ENDIF()
+@@ -890,7 +890,7 @@
include(\\${CMAKE_CURRENT_LIST_DIR}/../${TRIBITS_PACKAGE}/${TRIBITS_PACKAGE}Con
+ )
+ INSTALL(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+-DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}
++DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}
+ )
+
+ ENDFUNCTION()
diff --git a/sci-libs/trilinos/trilinos-11.12.1.ebuild
b/sci-libs/trilinos/trilinos-11.12.1.ebuild
new file mode 100644
index 000..51734a4
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-11.12.1.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2014 Gentoo
