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

[Matthias Maier]

commit:     38595d3ace6adaa1b66b6641598eb4dfcd9ae94b
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 17:29:10 2018 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Mar  1 20:18:27 2018 +0000
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..000000000
--- 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..000000000
--- a/sci-libs/trilinos/files/trilinos-11.4.2-fix-install-paths.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake 2012-11-12 14:58:00.000000000 +0100
-+++ b/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake 2012-11-12 14:42:47.000000000 +0100
-@@ -478,8 +478,8 @@
-   # directories using the installed config file. This is to deal with
-   # installers that allow relocation of the install tree at *install*
-   # time.
--  SET(FULL_LIBRARY_DIRS_SET "\${CMAKE_CURRENT_LIST_DIR}/../../../${${PROJECT_NAME}_INSTALL_LIB_DIR}")
--  SET(FULL_INCLUDE_DIRS_SET "\${CMAKE_CURRENT_LIST_DIR}/../../../${${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 "")
-@@ -548,7 +548,7 @@
-   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
-       )
- 
-@@ -766,8 +766,8 @@
-   # directories using the installed config file. This is to deal with
-   # installers that allow relocation of the install tree at *install*
-   # time.
--  SET(${PROJECT_NAME}_CONFIG_INCLUDE_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../../../${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
--  SET(${PROJECT_NAME}_CONFIG_LIBRARY_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../../../${${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)
-@@ -782,7 +782,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.
-@@ -809,7 +809,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
-       )
-   ENDIF()
-@@ -853,7 +853,7 @@
- 
-   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-12.0.1-fix_install_paths_for_destdir.patch b/sci-libs/trilinos/files/trilinos-12.0.1-fix_install_paths_for_destdir.patch
deleted file mode 100644
index cb08d26e9..000000000
--- a/sci-libs/trilinos/files/trilinos-12.0.1-fix_install_paths_for_destdir.patch
+++ /dev/null
@@ -1,654 +0,0 @@
-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 7daf4ec..1740fe6 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/seacas/libraries/ioss/src/init/CMakeLists.txt b/packages/seacas/libraries/ioss/src/init/CMakeLists.txt
-index 573c972..8056913 100644
---- a/packages/seacas/libraries/ioss/src/init/CMakeLists.txt
-+++ b/packages/seacas/libraries/ioss/src/init/CMakeLists.txt
-@@ -50,5 +50,5 @@ IF (BUILD_TESTING)
- ENDIF (BUILD_TESTING)
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${Trilinos_INSTALL_INCLUDE_DIR}/init/)
-+    ${Trilinos_INSTALL_INCLUDE_DIR}/init/)
- 
-diff --git a/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt b/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt
-index 695b21d..8f2045c 100644
---- a/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt
-@@ -46,7 +46,7 @@ TRIBITS_ADD_LIBRARY(
- )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/)
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/)
- 
- ADD_SUBDIRECTORY(main)
- 
-diff --git a/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt b/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt
-index db930be..c3cd3b4 100644
---- a/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt
-@@ -34,5 +34,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/)
- 
-diff --git a/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt b/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
-index ec7f650..a98b073 100644
---- a/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
-@@ -22,5 +22,5 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/)
- 
-diff --git a/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt b/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
-index e738def..e8ad166 100644
---- a/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
-@@ -47,4 +47,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
-diff --git a/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt b/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
-index 38d9b5c..7b1d105 100644
---- a/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
-@@ -50,7 +50,7 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
- 
- # AGS: I moved this to the bottom so that the link order was correct
- # with  -lstk_io_uti before -lstk_io.  I think the DEPLIBS added in
-diff --git a/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt b/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
-index 0412574..b15f54a 100644
---- a/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
-@@ -46,4 +46,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
-diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
-index 71c6697..770eb52 100644
---- a/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
-@@ -55,7 +55,7 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
- 
- INSTALL(FILES ${HEADERS_IMPL} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
-diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
-index 844088a..398640d 100644
---- a/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
-@@ -49,5 +49,5 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/)
- 
-diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
-index 7162134..4738933 100644
---- a/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
-@@ -55,4 +55,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/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt
-index 854268d..68b3533 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt
-@@ -68,5 +68,5 @@ TRIBITS_ADD_LIBRARY(
- )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/)
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/)
- 
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt
-index 10868c3..fa854bc 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt
-@@ -35,5 +35,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/)
- 
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt
-index a60a1a8..6f2d965 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt
-@@ -37,5 +37,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/)
- 
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt
-index ebea648..e6f5344 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt
-@@ -36,5 +36,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/)
- 
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt
-index 2b256f1..b27238f 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt
-@@ -35,5 +35,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/)
- 
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt
-index 2acb307..411ab23 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt
-@@ -35,5 +35,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/)
- 
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt
-index e9c2a8c..2353f6c 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt
-@@ -35,5 +35,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/)
- 
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt
-index 63ae85d..3978bf5 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt
-@@ -35,5 +35,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/)
- 
-diff --git a/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt b/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
-index 90ab292..930279b 100644
---- a/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
-@@ -47,4 +47,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/)
-diff --git a/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt b/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
-index 2582b19..2f35d7a 100644
---- a/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
-@@ -19,4 +19,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--  ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils)
-+  ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils)
-diff --git a/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt b/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
-index a70b0b8..3f8d6ac 100644
---- a/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
-@@ -63,4 +63,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
-diff --git a/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt b/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
-index 55a388e..9a5cbfb 100644
---- a/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
-@@ -35,5 +35,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/)
- 
-diff --git a/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt b/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
-index 33de7e0..d904256 100644
---- a/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
-@@ -55,4 +55,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- #INSTALL(FILES ${HEADERS} DESTINATION
--#    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
-+#    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
-index 4a91d34..c00793d 100644
---- a/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
-@@ -16,6 +16,6 @@ ENDIF()
- TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
- 
- INSTALL(FILES stk_config.h DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STKClassic_config.h DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
-index 105822f..f232e2c 100644
---- a/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
-@@ -83,5 +83,5 @@ TRIBITS_ADD_LIBRARY(
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
- 
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
-index 0493a45..6e5673c 100644
---- a/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
-@@ -81,4 +81,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--        ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
-+        ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
-index f441b60..e64f34d 100644
---- a/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
-@@ -62,4 +62,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
-index 174a0bb..3827f7f 100644
---- a/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
-@@ -51,4 +51,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
-index ed25e41..9314e7a 100644
---- a/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
-@@ -50,4 +50,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- #INSTALL(FILES ${HEADERS} DESTINATION
--#    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/)
-+#    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/)
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
-index 56b7873..8d83357 100644
---- a/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
-@@ -47,4 +47,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
-diff --git a/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt b/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
-index 467dfa1..605aefd 100644
---- a/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
-+++ b/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
-@@ -78,4 +78,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
-diff --git a/packages/stk/stk_io/stk_io/CMakeLists.txt b/packages/stk/stk_io/stk_io/CMakeLists.txt
-index 1cc9609..16e1fe0 100644
---- a/packages/stk/stk_io/stk_io/CMakeLists.txt
-+++ b/packages/stk/stk_io/stk_io/CMakeLists.txt
-@@ -80,7 +80,7 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
- 
- # AGS: I moved this to the bottom so that the link order was correct
- # with  -lstk_io_uti before -lstk_io.  I think the DEPLIBS added in
-diff --git a/packages/stk/stk_io/stk_io/util/CMakeLists.txt b/packages/stk/stk_io/stk_io/util/CMakeLists.txt
-index beee08b..1d78255 100644
---- a/packages/stk/stk_io/stk_io/util/CMakeLists.txt
-+++ b/packages/stk/stk_io/stk_io/util/CMakeLists.txt
-@@ -77,4 +77,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
-diff --git a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
-index 5db69c1..9e60c2e 100644
---- a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
-+++ b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
-@@ -80,7 +80,7 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
- 
- INSTALL(FILES ${HEADERS_IMPL} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
-diff --git a/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt b/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
-index 164e07c..99411b6 100644
---- a/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
-+++ b/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
-@@ -72,4 +72,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/packages/stk/stk_search/stk_search/CMakeLists.txt b/packages/stk/stk_search/stk_search/CMakeLists.txt
-index ae6cc04..199c82f 100644
---- a/packages/stk/stk_search/stk_search/CMakeLists.txt
-+++ b/packages/stk/stk_search/stk_search/CMakeLists.txt
-@@ -69,4 +69,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
-diff --git a/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt b/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
-index ca6e439..dd460d4 100644
---- a/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
-+++ b/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
-@@ -68,5 +68,5 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util)
-     
-diff --git a/packages/stk/stk_topology/stk_topology/CMakeLists.txt b/packages/stk/stk_topology/stk_topology/CMakeLists.txt
-index 7364267..f1d03d3 100644
---- a/packages/stk/stk_topology/stk_topology/CMakeLists.txt
-+++ b/packages/stk/stk_topology/stk_topology/CMakeLists.txt
-@@ -72,7 +72,7 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/)
- 
- INSTALL(FILES ${DETAIL_HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail)
-diff --git a/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt b/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
-index 667cb5d..ce11394 100644
---- a/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
-+++ b/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
-@@ -5,4 +5,4 @@
- FILE(GLOB HEADERS *.hpp)
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
-diff --git a/packages/stk/stk_util/stk_util/CMakeLists.txt b/packages/stk/stk_util/stk_util/CMakeLists.txt
-index 02f4bf2..e95b05c 100644
---- a/packages/stk/stk_util/stk_util/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/CMakeLists.txt
-@@ -18,6 +18,6 @@ TRIBITS_CONFIGURE_FILE(STK_Trilinos_config.h)
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
- 
- INSTALL(FILES stk_config.h DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STK_Trilinos_config.h DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
-diff --git a/packages/stk/stk_util/stk_util/diag/CMakeLists.txt b/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
-index 32115b6..184062a 100644
---- a/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
-@@ -76,5 +76,5 @@ TRIBITS_ADD_LIBRARY(
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
- 
-diff --git a/packages/stk/stk_util/stk_util/environment/CMakeLists.txt b/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
-index f3ecc5d..8268018 100644
---- a/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
-@@ -74,4 +74,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--        ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
-+        ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
-diff --git a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
-index 51e11fd..dba3e15 100644
---- a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
-@@ -93,4 +93,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
-diff --git a/packages/stk/stk_util/stk_util/registry/CMakeLists.txt b/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
-index 2fa8a9b..dbc5000 100644
---- a/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
-@@ -71,5 +71,5 @@ TRIBITS_ADD_LIBRARY(
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/)
- 
-diff --git a/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt b/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
-index 4a39491..ed521a4 100644
---- a/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
-@@ -79,4 +79,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
-diff --git a/packages/stk/stk_util/stk_util/util/CMakeLists.txt b/packages/stk/stk_util/stk_util/util/CMakeLists.txt
-index b12d75e..054f60d 100644
---- a/packages/stk/stk_util/stk_util/util/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/util/CMakeLists.txt
-@@ -76,4 +76,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
-diff --git a/packages/teuchos/kokkoscompat/src/CMakeLists.txt b/packages/teuchos/kokkoscompat/src/CMakeLists.txt
-index 030a7c6..c0d49dc 100644
---- a/packages/teuchos/kokkoscompat/src/CMakeLists.txt
-+++ b/packages/teuchos/kokkoscompat/src/CMakeLists.txt
-@@ -27,7 +27,7 @@ TRIBITS_ADD_LIBRARY(
- # FIXME (mfh 19 Dec 2014) We should rely on TriBITS to handle
- # installation.
- 
--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}/)
- 
-diff --git a/packages/trios/libraries/support/CMakeLists.txt b/packages/trios/libraries/support/CMakeLists.txt
-index 3b8c4fd..175f736 100644
---- a/packages/trios/libraries/support/CMakeLists.txt
-+++ b/packages/trios/libraries/support/CMakeLists.txt
-@@ -168,6 +168,6 @@ TRIBITS_ADD_LIBRARY(
- 
- ########### install targets ###############
- 
--# INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-+# INSTALL(FILES ${MODULES} DESTINATION include)
- 
- TRIBITS_SUBPACKAGE_POSTPROCESS()
-diff --git a/packages/zoltan/src/CMakeLists.txt b/packages/zoltan/src/CMakeLists.txt
-index c312433..8a52ec4 100644
---- a/packages/zoltan/src/CMakeLists.txt
-+++ b/packages/zoltan/src/CMakeLists.txt
-@@ -678,5 +678,5 @@ TRIBITS_ADD_LIBRARY(
-   IMPORTEDLIBS ${IMPORTEDLIBS}
-   )
- 
--INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-+INSTALL(FILES ${MODULES} DESTINATION include)
- 
-diff --git a/packages/zoltan/src/fdriver/CMakeLists.txt b/packages/zoltan/src/fdriver/CMakeLists.txt
-index 64345d3..e60c2e3 100644
---- a/packages/zoltan/src/fdriver/CMakeLists.txt
-+++ b/packages/zoltan/src/fdriver/CMakeLists.txt
-@@ -35,6 +35,6 @@ TRIBITS_ADD_EXECUTABLE(
- 
- #  What is a good location for executables zdrive and zCPPdrive?
- #  When should they be moved there?  During install?  Or build?
--#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-+#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION bin)
- 
- ENDIF()
-diff --git a/packages/rol/adapters/belos/src/CMakeLists.txt b/packages/rol/adapters/belos/src/CMakeLists.txt
-index 7672258..b844022 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 b5f2416..2d251dc 100644
---- a/packages/rol/adapters/epetra/src/CMakeLists.txt
-+++ b/packages/rol/adapters/epetra/src/CMakeLists.txt
-@@ -37,4 +37,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})
-+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-diff --git a/packages/rol/adapters/tpetra/src/CMakeLists.txt b/packages/rol/adapters/tpetra/src/CMakeLists.txt
-index 51c2e92..1b9eab1 100644
---- a/packages/rol/adapters/tpetra/src/CMakeLists.txt
-+++ b/packages/rol/adapters/tpetra/src/CMakeLists.txt
-@@ -39,4 +39,4 @@ IF (ROL_ENABLE_Tpetra)
-  )
- 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/sci-libs/trilinos/files/trilinos-12.2.1-compilation_fixes.patch b/sci-libs/trilinos/files/trilinos-12.2.1-compilation_fixes.patch
deleted file mode 100644
index a77a8dccf..000000000
--- a/sci-libs/trilinos/files/trilinos-12.2.1-compilation_fixes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/packages/fei/test_utils/snl_fei_tester.cpp b/packages/fei/test_utils/snl_fei_tester.cpp
-index 0ebfa9d..17278ee 100644
---- a/packages/fei/test_utils/snl_fei_tester.cpp
-+++ b/packages/fei/test_utils/snl_fei_tester.cpp
-@@ -523,7 +523,7 @@ int snl_fei_tester::save_block_node_soln(DataReader& data, fei::Vector* vec,
-   FEI_OFSTREAM outfile(str.c_str());
- 
-   if (!outfile || outfile.bad()) {
--    fei::console_out() << "ERROR opening solution output file " << fileName << FEI_ENDL;
-+    fei::console_out() << "ERROR opening solution output file " << fileName.str() << FEI_ENDL;
-     return(-1);
-   }
- 
-@@ -591,7 +591,7 @@ int snl_fei_tester::save_block_elem_soln(DataReader& data, fei::Vector* vec,
-   FEI_OFSTREAM outfile(str.c_str());
- 
-   if (!outfile || outfile.bad()) {
--    fei::console_out() << "ERROR opening solution output file " << fileName << FEI_ENDL;
-+    fei::console_out() << "ERROR opening solution output file " << fileName.str() << FEI_ENDL;
-     return(-1);
-   }
- 
-@@ -668,7 +668,7 @@ int snl_fei_tester::save_multiplier_soln(DataReader& data, fei::Vector* vec,
-   FEI_OFSTREAM outfile(str.c_str());
- 
-   if (!outfile || outfile.bad()) {
--    fei::console_out() << "ERROR opening solution output file " << fileName << FEI_ENDL;
-+    fei::console_out() << "ERROR opening solution output file " << fileName.str() << FEI_ENDL;
-     return(-1);
-   }
- 
-diff --git a/packages/ifpack/src/Ifpack_Hypre.cpp b/packages/ifpack/src/Ifpack_Hypre.cpp
-index ea6ba35..26a1281 100644
---- a/packages/ifpack/src/Ifpack_Hypre.cpp
-+++ b/packages/ifpack/src/Ifpack_Hypre.cpp
-@@ -51,6 +51,7 @@
- 
- using Teuchos::RCP;
- using Teuchos::rcp;
-+using std::endl;
- 
- Ifpack_Hypre::Ifpack_Hypre(Epetra_RowMatrix* A):
-   A_(rcp(A,false)),

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
deleted file mode 100644
index d3556c7cb..000000000
--- a/sci-libs/trilinos/files/trilinos-12.6.2-fix_install_paths_for_destdir.patch
+++ /dev/null
@@ -1,652 +0,0 @@
-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})
-+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-diff --git a/packages/rol/adapters/tpetra/src/CMakeLists.txt b/packages/rol/adapters/tpetra/src/CMakeLists.txt
-index 51c2e92..1b9eab1 100644
---- a/packages/rol/adapters/tpetra/src/CMakeLists.txt
-+++ b/packages/rol/adapters/tpetra/src/CMakeLists.txt
-@@ -39,4 +39,4 @@ IF (ROL_ENABLE_Tpetra)
-  )
- 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/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt b/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt
-index 695b21d..8f2045c 100644
---- a/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt
-@@ -46,7 +46,7 @@ TRIBITS_ADD_LIBRARY(
- )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/)
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/)
- 
- ADD_SUBDIRECTORY(main)
- 
-diff --git a/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt b/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt
-index db930be..c3cd3b4 100644
---- a/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt
-@@ -34,5 +34,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/)
- 
-diff --git a/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt b/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
-index ec7f650..a98b073 100644
---- a/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
-@@ -22,5 +22,5 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/)
- 
-diff --git a/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt b/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
-index e738def..e8ad166 100644
---- a/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
-@@ -47,4 +47,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
-diff --git a/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt b/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
-index 38d9b5c..7b1d105 100644
---- a/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
-@@ -50,7 +50,7 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
- 
- # AGS: I moved this to the bottom so that the link order was correct
- # with  -lstk_io_uti before -lstk_io.  I think the DEPLIBS added in
-diff --git a/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt b/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
-index 0412574..b15f54a 100644
---- a/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
-@@ -46,4 +46,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
-diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
-index 71c6697..770eb52 100644
---- a/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
-@@ -55,7 +55,7 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
- 
- INSTALL(FILES ${HEADERS_IMPL} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
-diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
-index 844088a..398640d 100644
---- a/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
-@@ -49,5 +49,5 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/)
- 
-diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
-index 7162134..4738933 100644
---- a/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
-@@ -55,4 +55,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/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt
-index 854268d..68b3533 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt
-@@ -68,5 +68,5 @@ TRIBITS_ADD_LIBRARY(
- )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/)
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/)
- 
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt
-index 10868c3..fa854bc 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt
-@@ -35,5 +35,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/)
- 
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt
-index a60a1a8..6f2d965 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt
-@@ -37,5 +37,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/)
- 
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt
-index ebea648..e6f5344 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt
-@@ -36,5 +36,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/)
- 
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt
-index 2b256f1..b27238f 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt
-@@ -35,5 +35,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/)
- 
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt
-index 2acb307..411ab23 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt
-@@ -35,5 +35,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/)
- 
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt
-index e9c2a8c..2353f6c 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt
-@@ -35,5 +35,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/)
- 
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt
-index 63ae85d..3978bf5 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt
-@@ -35,5 +35,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/)
- 
-diff --git a/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt b/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
-index 90ab292..930279b 100644
---- a/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
-@@ -47,4 +47,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/)
-diff --git a/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt b/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
-index 2582b19..2f35d7a 100644
---- a/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
-@@ -19,4 +19,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--  ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils)
-+  ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils)
-diff --git a/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt b/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
-index a70b0b8..3f8d6ac 100644
---- a/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
-@@ -63,4 +63,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
-diff --git a/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt b/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
-index 55a388e..9a5cbfb 100644
---- a/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
-@@ -35,5 +35,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/)
- 
-diff --git a/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt b/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
-index 33de7e0..d904256 100644
---- a/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
-@@ -55,4 +55,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- #INSTALL(FILES ${HEADERS} DESTINATION
--#    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
-+#    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
-index 4a91d34..c00793d 100644
---- a/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
-@@ -16,6 +16,6 @@ ENDIF()
- TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
- 
- INSTALL(FILES stk_config.h DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STKClassic_config.h DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
-index 105822f..f232e2c 100644
---- a/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
-@@ -83,5 +83,5 @@ TRIBITS_ADD_LIBRARY(
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
- 
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
-index 0493a45..6e5673c 100644
---- a/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
-@@ -81,4 +81,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--        ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
-+        ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
-index f441b60..e64f34d 100644
---- a/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
-@@ -62,4 +62,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
-index 174a0bb..3827f7f 100644
---- a/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
-@@ -51,4 +51,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
-index ed25e41..9314e7a 100644
---- a/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
-@@ -50,4 +50,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- #INSTALL(FILES ${HEADERS} DESTINATION
--#    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/)
-+#    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/)
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
-index 56b7873..8d83357 100644
---- a/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
-@@ -47,4 +47,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
-diff --git a/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt b/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
-index 467dfa1..605aefd 100644
---- a/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
-+++ b/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
-@@ -78,4 +78,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
-diff --git a/packages/stk/stk_io/stk_io/CMakeLists.txt b/packages/stk/stk_io/stk_io/CMakeLists.txt
-index 5a04b77..6a6872e 100644
---- a/packages/stk/stk_io/stk_io/CMakeLists.txt
-+++ b/packages/stk/stk_io/stk_io/CMakeLists.txt
-@@ -79,7 +79,7 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
- 
- # AGS: I moved this to the bottom so that the link order was correct
- # with  -lstk_io_uti before -lstk_io.  I think the DEPLIBS added in
-diff --git a/packages/stk/stk_io/stk_io/util/CMakeLists.txt b/packages/stk/stk_io/stk_io/util/CMakeLists.txt
-index beee08b..1d78255 100644
---- a/packages/stk/stk_io/stk_io/util/CMakeLists.txt
-+++ b/packages/stk/stk_io/stk_io/util/CMakeLists.txt
-@@ -77,4 +77,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
-diff --git a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
-index 1258631..f3afeb8 100644
---- a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
-+++ b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
-@@ -85,14 +85,13 @@ TRIBITS_ADD_LIBRARY(
- TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
- 
- INSTALL(FILES ${HEADERS_IMPL} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
- 
- INSTALL(FILES ${HEADERS_ELEMGRAPH} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/elementGraph)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/elementGraph)
- 
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h DESTINATION
--        ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
--
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-diff --git a/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt b/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
-index c025e1c..77937c4 100644
---- a/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
-+++ b/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
-@@ -72,4 +72,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/packages/stk/stk_search/stk_search/CMakeLists.txt b/packages/stk/stk_search/stk_search/CMakeLists.txt
-index ae6cc04..199c82f 100644
---- a/packages/stk/stk_search/stk_search/CMakeLists.txt
-+++ b/packages/stk/stk_search/stk_search/CMakeLists.txt
-@@ -69,4 +69,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
-diff --git a/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt b/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
-index ca6e439..dd460d4 100644
---- a/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
-+++ b/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
-@@ -68,5 +68,5 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util)
-     
-diff --git a/packages/stk/stk_topology/stk_topology/CMakeLists.txt b/packages/stk/stk_topology/stk_topology/CMakeLists.txt
-index 647c895..cd55770 100644
---- a/packages/stk/stk_topology/stk_topology/CMakeLists.txt
-+++ b/packages/stk/stk_topology/stk_topology/CMakeLists.txt
-@@ -72,7 +72,7 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/)
- 
- INSTALL(FILES ${DETAIL_HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail)
-diff --git a/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt b/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
-index 667cb5d..ce11394 100644
---- a/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
-+++ b/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
-@@ -5,4 +5,4 @@
- FILE(GLOB HEADERS *.hpp)
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
-diff --git a/packages/stk/stk_util/stk_util/CMakeLists.txt b/packages/stk/stk_util/stk_util/CMakeLists.txt
-index 02f4bf2..e95b05c 100644
---- a/packages/stk/stk_util/stk_util/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/CMakeLists.txt
-@@ -18,6 +18,6 @@ TRIBITS_CONFIGURE_FILE(STK_Trilinos_config.h)
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
- 
- INSTALL(FILES stk_config.h DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STK_Trilinos_config.h DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
-diff --git a/packages/stk/stk_util/stk_util/diag/CMakeLists.txt b/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
-index 41d36f6..146099c 100644
---- a/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
-@@ -76,5 +76,5 @@ TRIBITS_ADD_LIBRARY(
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
- 
-diff --git a/packages/stk/stk_util/stk_util/environment/CMakeLists.txt b/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
-index 108c464..ef40627 100644
---- a/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
-@@ -74,4 +74,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--        ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
-+        ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
-diff --git a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
-index 29da134..e350a7d 100644
---- a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
-@@ -94,4 +94,4 @@ FILE(GLOB SOURCES *.cpp)
- #  )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
-diff --git a/packages/stk/stk_util/stk_util/registry/CMakeLists.txt b/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
-index b616750..412dd0e 100644
---- a/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
-@@ -71,5 +71,5 @@ TRIBITS_ADD_LIBRARY(
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/)
- 
-diff --git a/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt b/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
-index 0629e38..493bd52 100644
---- a/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
-@@ -79,4 +79,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
-diff --git a/packages/stk/stk_util/stk_util/util/CMakeLists.txt b/packages/stk/stk_util/stk_util/util/CMakeLists.txt
-index b12d75e..054f60d 100644
---- a/packages/stk/stk_util/stk_util/util/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/util/CMakeLists.txt
-@@ -76,4 +76,4 @@ TRIBITS_ADD_LIBRARY(
-   )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
-+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
-diff --git a/packages/teuchos/kokkoscompat/src/CMakeLists.txt b/packages/teuchos/kokkoscompat/src/CMakeLists.txt
-index 030a7c6..c0d49dc 100644
---- a/packages/teuchos/kokkoscompat/src/CMakeLists.txt
-+++ b/packages/teuchos/kokkoscompat/src/CMakeLists.txt
-@@ -27,7 +27,7 @@ TRIBITS_ADD_LIBRARY(
- # FIXME (mfh 19 Dec 2014) We should rely on TriBITS to handle
- # installation.
- 
--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}/)
- 
-diff --git a/packages/trios/libraries/support/CMakeLists.txt b/packages/trios/libraries/support/CMakeLists.txt
-index 3b8c4fd..175f736 100644
---- a/packages/trios/libraries/support/CMakeLists.txt
-+++ b/packages/trios/libraries/support/CMakeLists.txt
-@@ -168,6 +168,6 @@ TRIBITS_ADD_LIBRARY(
- 
- ########### install targets ###############
- 
--# INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-+# INSTALL(FILES ${MODULES} DESTINATION include)
- 
- TRIBITS_SUBPACKAGE_POSTPROCESS()
-diff --git a/packages/zoltan/src/CMakeLists.txt b/packages/zoltan/src/CMakeLists.txt
-index e3993d9..af1554f 100644
---- a/packages/zoltan/src/CMakeLists.txt
-+++ b/packages/zoltan/src/CMakeLists.txt
-@@ -678,5 +678,5 @@ TRIBITS_ADD_LIBRARY(
-   IMPORTEDLIBS ${IMPORTEDLIBS}
-   )
- 
--INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-+INSTALL(FILES ${MODULES} DESTINATION include)
- 
-diff --git a/packages/zoltan/src/fdriver/CMakeLists.txt b/packages/zoltan/src/fdriver/CMakeLists.txt
-index 32913f3..8dd9cba 100644
---- a/packages/zoltan/src/fdriver/CMakeLists.txt
-+++ b/packages/zoltan/src/fdriver/CMakeLists.txt
-@@ -33,6 +33,6 @@ IF(${PROJECT_NAME}_ENABLE_Fortran AND BUILD_ZOLTAN_F90_INTERFACE)
- 
- #  What is a good location for executables zdrive and zCPPdrive?
- #  When should they be moved there?  During install?  Or build?
--#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-+#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION bin)
- 
- ENDIF()

diff --git a/sci-libs/trilinos/trilinos-12.0.1.ebuild b/sci-libs/trilinos/trilinos-12.0.1.ebuild
deleted file mode 100644
index d216f5411..000000000
--- a/sci-libs/trilinos/trilinos-12.0.1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs multilib toolchain-funcs
-
-DESCRIPTION="Scientific library collection for large scale problems"
-HOMEPAGE="http://trilinos.sandia.gov/"
-SRC_URI="http://trilinos.org/oldsite/download/files/${P}-Source.tar.gz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD LGPL-2.1"
-SLOT="0"
-
-IUSE="
-	adolc arprec boost clp cppunit cuda eigen glpk gtest hdf5 hwloc hypre
-	matio metis mkl mumps netcdf petsc qd qt4 scalapack scotch sparse
-	superlu taucs tbb test threads tvmet yaml zlib
-"
-
-# TODO: fix export cmake function for tests
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/binutils-libs
-	virtual/blas
-	virtual/lapack
-	virtual/mpi
-	adolc? ( sci-libs/adolc )
-	arprec? ( sci-libs/arprec )
-	boost? ( dev-libs/boost )
-	clp? ( sci-libs/coinor-clp )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
-	eigen? ( dev-cpp/eigen:3 )
-	gtest? ( dev-cpp/gtest )
-	hdf5? ( sci-libs/hdf5[mpi] )
-	hypre? ( sci-libs/hypre )
-	hwloc? ( sys-apps/hwloc )
-	matio? ( sci-libs/matio )
-	mkl? ( sci-libs/mkl )
-	metis? ( || ( sci-libs/parmetis sci-libs/metis ) )
-	mumps? ( sci-libs/mumps )
-	netcdf? ( sci-libs/netcdf )
-	petsc? ( sci-mathematics/petsc )
-	qd? ( sci-libs/qd )
-	qt4? ( dev-qt/qtgui:4 )
-	scalapack? ( virtual/scalapack )
-	scotch? ( sci-libs/scotch )
-	sparse? ( sci-libs/cxsparse sci-libs/umfpack )
-	superlu? ( sci-libs/superlu )
-	taucs? ( sci-libs/taucs )
-	tbb? ( dev-cpp/tbb )
-	tvmet? ( dev-libs/tvmet )
-	yaml? ( dev-cpp/yaml-cpp )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${P}-Source"
-
-trilinos_conf() {
-	local dirs libs d
-	for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
-		dirs="${dirs};${d:2}"
-	done
-	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" )
-	for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
-		libs="${libs};${d:2}"
-	done
-	[[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" )
-	dirs=""
-	for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do
-		dirs="${dirs};${d:2}"
-	done
-	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" )
-}
-
-trilinos_enable() {
-	cmake-utils_use $1 TPL_ENABLE_${2:-${1^^}}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch
-	epatch "${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch
-}
-
-src_configure() {
-
-	# temporarily disable SEACAS and pyTrilinos compilation
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"
-		-DTrilinos_ENABLE_ALL_PACKAGES=ON
-		-DTrilinos_ENABLE_SEACAS=OFF
-		-DTrilinos_ENABLE_PyTrilinos=OFF
-		-DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
-		-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
-		-DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
-		-DTPL_ENABLE_BinUtils=ON
-		-DTPL_ENABLE_MPI=ON
-		-DTPL_ENABLE_BLAS=ON
-		-DTPL_ENABLE_LAPACK=ON
-		$(cmake-utils_use test Trilinos_ENABLE_TESTS)
-		$(trilinos_enable adolc)
-		$(trilinos_enable arprec)
-		$(trilinos_enable boost Boost)
-		$(trilinos_enable boost BoostLib)
-		$(trilinos_enable cppunit Cppunit)
-		$(trilinos_enable clp Clp)
-		$(trilinos_enable cuda)
-		$(trilinos_enable cuda CUSPARSE)
-		$(trilinos_enable cuda Thrust)
-		$(trilinos_enable eigen Eigen)
-		$(trilinos_enable gtest gtest)
-		$(trilinos_enable glpk)
-		$(trilinos_enable hdf5)
-		$(trilinos_enable hwloc)
-		$(trilinos_enable hypre)
-		$(trilinos_enable matio)
-		$(trilinos_enable metis)
-		$(trilinos_enable mkl)
-		$(trilinos_enable mkl PARDISO_MKL)
-		$(trilinos_enable mumps)
-		$(trilinos_enable netcdf Netcdf)
-		$(trilinos_enable petsc)
-		$(trilinos_enable qd)
-		$(trilinos_enable qt4 QT)
-		$(trilinos_enable scalapack)
-		$(trilinos_enable scalapack BLACS)
-		$(trilinos_enable scotch Scotch)
-		$(trilinos_enable sparse AMD)
-		$(trilinos_enable sparse CSparse)
-		$(trilinos_enable sparse UMFPACK)
-		$(trilinos_enable superlu SuperLU)
-		$(trilinos_enable taucs)
-		$(trilinos_enable tbb)
-		$(trilinos_enable threads Pthread)
-		$(trilinos_enable tvmet)
-		$(trilinos_enable yaml yaml-cpp)
-		$(trilinos_enable zlib Zlib)
-	)
-
-	use eigen && \
-		mycmakeargs+=(
-		-DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3"
-	)
-	use hypre && \
-		mycmakeargs+=(
-		-DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre"
-	)
-	use scotch && \
-		mycmakeargs+=(
-		-DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch"
-	)
-
-	# cxsparse is a rewrite of csparse + extras
-	use sparse && \
-		mycmakeargs+=(
-		-DCSparse_LIBRARY_NAMES="cxsparse"
-	)
-
-	# mandatory blas and lapack
-	trilinos_conf blas BLAS
-	trilinos_conf lapack LAPACK
-	use superlu && trilinos_conf superlu SuperLU
-	use metis && trilinos_conf metis METIS
-
-	# blacs library is included in scalapack these days
-	if use scalapack; then
-		trilinos_conf scalapack SCALAPACK
-		mycmakeargs+=(
-			-DBLACS_LIBRARY_NAMES="scalapack"
-			-DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs"
-		)
-	fi
-
-	# TODO: do we need that line?
-	export CC=mpicc CXX=mpicxx && tc-export CC CXX
-
-	# cmake-utils eclass patches the base directory CMakeLists.txt
-	# which does not work for complex Trilinos CMake modules
-	CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure
-
-	# TODO:
-	# python bindings with python-r1
-	# fix hypre bindings
-	# fix hdf5
-	# cuda/thrust is untested
-	# do we always need mpi? and for all packages: blah[mpi] ?
-	# install docs, examples
-	# see what packages are related, do we need REQUIRED_USE
-	# proper use flags description
-	# add more use flags/packages ?
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# register $(get_libdir)/trilinos in LDPATH so that the dynamic linker
-	# has a chance to pick up the libraries...
-	cat >> "${T}"/99trilinos <<- EOF
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos"
-	EOF
-	doenvd "${T}"/99trilinos
-}

diff --git a/sci-libs/trilinos/trilinos-12.2.1.ebuild b/sci-libs/trilinos/trilinos-12.2.1.ebuild
deleted file mode 100644
index f1870a99e..000000000
--- a/sci-libs/trilinos/trilinos-12.2.1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs multilib toolchain-funcs
-
-DESCRIPTION="Scientific library collection for large scale problems"
-HOMEPAGE="http://trilinos.sandia.gov/"
-SRC_URI="http://trilinos.org/oldsite/download/files/${P}-Source.tar.gz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD LGPL-2.1"
-SLOT="0"
-
-IUSE="
-	adolc arprec boost clp cppunit cuda eigen glpk gtest hdf5 hwloc hypre
-	matio metis mkl mumps netcdf petsc qd qt4 scalapack scotch sparse
-	superlu taucs tbb test threads tvmet yaml zlib
-"
-
-# TODO: fix export cmake function for tests
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/binutils-libs
-	virtual/blas
-	virtual/lapack
-	virtual/mpi
-	adolc? ( sci-libs/adolc )
-	arprec? ( sci-libs/arprec )
-	boost? ( dev-libs/boost )
-	clp? ( sci-libs/coinor-clp )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
-	eigen? ( dev-cpp/eigen:3 )
-	gtest? ( dev-cpp/gtest )
-	hdf5? ( sci-libs/hdf5[mpi] )
-	hypre? ( sci-libs/hypre )
-	hwloc? ( sys-apps/hwloc )
-	matio? ( sci-libs/matio )
-	mkl? ( sci-libs/mkl )
-	metis? ( || ( sci-libs/parmetis sci-libs/metis ) )
-	mumps? ( sci-libs/mumps )
-	netcdf? ( sci-libs/netcdf )
-	petsc? ( sci-mathematics/petsc )
-	qd? ( sci-libs/qd )
-	qt4? ( dev-qt/qtgui:4 )
-	scalapack? ( virtual/scalapack )
-	scotch? ( sci-libs/scotch )
-	sparse? ( sci-libs/cxsparse sci-libs/umfpack )
-	superlu? ( sci-libs/superlu )
-	taucs? ( sci-libs/taucs )
-	tbb? ( dev-cpp/tbb )
-	tvmet? ( dev-libs/tvmet )
-	yaml? ( dev-cpp/yaml-cpp )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${P}-Source"
-
-trilinos_conf() {
-	local dirs libs d
-	for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
-		dirs="${dirs};${d:2}"
-	done
-	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" )
-	for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
-		libs="${libs};${d:2}"
-	done
-	[[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" )
-	dirs=""
-	for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do
-		dirs="${dirs};${d:2}"
-	done
-	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" )
-}
-
-trilinos_enable() {
-	cmake-utils_use $1 TPL_ENABLE_${2:-${1^^}}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch \
-		"${FILESDIR}"/${PN}-12.0.1-fix_install_paths_for_destdir.patch \
-		"${FILESDIR}"/${P}-compilation_fixes.patch
-}
-
-src_configure() {
-
-	# temporarily disable SEACAS and pyTrilinos compilation
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"
-		-DTrilinos_ENABLE_ALL_PACKAGES=ON
-		-DTrilinos_ENABLE_SEACAS=OFF
-		-DTrilinos_ENABLE_PyTrilinos=OFF
-		-DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
-		-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
-		-DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
-		-DTPL_ENABLE_BinUtils=ON
-		-DTPL_ENABLE_MPI=ON
-		-DTPL_ENABLE_BLAS=ON
-		-DTPL_ENABLE_LAPACK=ON
-		$(cmake-utils_use test Trilinos_ENABLE_TESTS)
-		$(trilinos_enable adolc)
-		$(trilinos_enable arprec)
-		$(trilinos_enable boost Boost)
-		$(trilinos_enable boost BoostLib)
-		$(trilinos_enable cppunit Cppunit)
-		$(trilinos_enable clp Clp)
-		$(trilinos_enable cuda)
-		$(trilinos_enable cuda CUSPARSE)
-		$(trilinos_enable cuda Thrust)
-		$(trilinos_enable eigen Eigen)
-		$(trilinos_enable gtest gtest)
-		$(trilinos_enable glpk)
-		$(trilinos_enable hdf5)
-		$(trilinos_enable hwloc)
-		$(trilinos_enable hypre)
-		$(trilinos_enable matio)
-		$(trilinos_enable metis)
-		$(trilinos_enable mkl)
-		$(trilinos_enable mkl PARDISO_MKL)
-		$(trilinos_enable mumps)
-		$(trilinos_enable netcdf Netcdf)
-		$(trilinos_enable petsc)
-		$(trilinos_enable qd)
-		$(trilinos_enable qt4 QT)
-		$(trilinos_enable scalapack)
-		$(trilinos_enable scalapack BLACS)
-		$(trilinos_enable scotch Scotch)
-		$(trilinos_enable sparse AMD)
-		$(trilinos_enable sparse CSparse)
-		$(trilinos_enable sparse UMFPACK)
-		$(trilinos_enable superlu SuperLU)
-		$(trilinos_enable taucs)
-		$(trilinos_enable tbb)
-		$(trilinos_enable threads Pthread)
-		$(trilinos_enable tvmet)
-		$(trilinos_enable yaml yaml-cpp)
-		$(trilinos_enable zlib Zlib)
-	)
-
-	use eigen && \
-		mycmakeargs+=(
-		-DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3"
-	)
-	use hypre && \
-		mycmakeargs+=(
-		-DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre"
-	)
-	use scotch && \
-		mycmakeargs+=(
-		-DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch"
-	)
-
-	# cxsparse is a rewrite of csparse + extras
-	use sparse && \
-		mycmakeargs+=(
-		-DCSparse_LIBRARY_NAMES="cxsparse"
-	)
-
-	# mandatory blas and lapack
-	trilinos_conf blas BLAS
-	trilinos_conf lapack LAPACK
-	use superlu && trilinos_conf superlu SuperLU
-	use metis && trilinos_conf metis METIS
-
-	# blacs library is included in scalapack these days
-	if use scalapack; then
-		trilinos_conf scalapack SCALAPACK
-		mycmakeargs+=(
-			-DBLACS_LIBRARY_NAMES="scalapack"
-			-DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs"
-		)
-	fi
-
-	# TODO: do we need that line?
-	export CC=mpicc CXX=mpicxx && tc-export CC CXX
-
-	# cmake-utils eclass patches the base directory CMakeLists.txt
-	# which does not work for complex Trilinos CMake modules
-	CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure
-
-	# TODO:
-	# python bindings with python-r1
-	# fix hypre bindings
-	# fix hdf5
-	# cuda/thrust is untested
-	# do we always need mpi? and for all packages: blah[mpi] ?
-	# install docs, examples
-	# see what packages are related, do we need REQUIRED_USE
-	# proper use flags description
-	# add more use flags/packages ?
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# register $(get_libdir)/trilinos in LDPATH so that the dynamic linker
-	# has a chance to pick up the libraries...
-	cat >> "${T}"/99trilinos <<- EOF
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos"
-	EOF
-	doenvd "${T}"/99trilinos
-}

diff --git a/sci-libs/trilinos/trilinos-12.6.3.ebuild b/sci-libs/trilinos/trilinos-12.6.3.ebuild
deleted file mode 100644
index 3beafc449..000000000
--- a/sci-libs/trilinos/trilinos-12.6.3.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs multilib toolchain-funcs
-
-DESCRIPTION="Scientific library collection for large scale problems"
-HOMEPAGE="http://trilinos.sandia.gov/"
-SRC_URI="http://trilinos.org/oldsite/download/files/${P}-Source.tar.gz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD LGPL-2.1"
-SLOT="0"
-
-IUSE="
-	adolc arprec boost clp cppunit cuda eigen glpk gtest hdf5 hwloc hypre
-	matio metis mkl mumps netcdf petsc qd qt4 scalapack scotch sparse
-	superlu taucs tbb test threads tvmet yaml zlib
-"
-
-# TODO: fix export cmake function for tests
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/binutils-libs
-	virtual/blas
-	virtual/lapack
-	virtual/mpi
-	adolc? ( sci-libs/adolc )
-	arprec? ( sci-libs/arprec )
-	boost? ( dev-libs/boost )
-	clp? ( sci-libs/coinor-clp )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
-	eigen? ( dev-cpp/eigen:3 )
-	gtest? ( dev-cpp/gtest )
-	hdf5? ( sci-libs/hdf5[mpi] )
-	hypre? ( sci-libs/hypre )
-	hwloc? ( sys-apps/hwloc )
-	matio? ( sci-libs/matio )
-	mkl? ( sci-libs/mkl )
-	metis? ( || ( sci-libs/parmetis sci-libs/metis ) )
-	mumps? ( sci-libs/mumps )
-	netcdf? ( sci-libs/netcdf )
-	petsc? ( sci-mathematics/petsc )
-	qd? ( sci-libs/qd )
-	qt4? ( dev-qt/qtgui:4 )
-	scalapack? ( virtual/scalapack )
-	scotch? ( sci-libs/scotch )
-	sparse? ( sci-libs/cxsparse sci-libs/umfpack )
-	superlu? ( sci-libs/superlu )
-	taucs? ( sci-libs/taucs )
-	tbb? ( dev-cpp/tbb )
-	tvmet? ( dev-libs/tvmet )
-	yaml? ( dev-cpp/yaml-cpp )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${P}-Source"
-
-trilinos_conf() {
-	local dirs libs d
-	for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
-		dirs="${dirs};${d:2}"
-	done
-	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" )
-	for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
-		libs="${libs};${d:2}"
-	done
-	[[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" )
-	dirs=""
-	for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do
-		dirs="${dirs};${d:2}"
-	done
-	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" )
-}
-
-trilinos_enable() {
-	cmake-utils_use $1 TPL_ENABLE_${2:-${1^^}}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch \
-		"${FILESDIR}"/${PN}-12.6.2-fix_install_paths_for_destdir.patch
-}
-
-src_configure() {
-
-	# temporarily disable SEACAS and pyTrilinos compilation
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"
-		-DTrilinos_ENABLE_ALL_PACKAGES=ON
-		-DTrilinos_ENABLE_SEACAS=OFF
-		-DTrilinos_ENABLE_PyTrilinos=OFF
-		-DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
-		-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
-		-DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
-		-DTPL_ENABLE_BinUtils=ON
-		-DTPL_ENABLE_MPI=ON
-		-DTPL_ENABLE_BLAS=ON
-		-DTPL_ENABLE_LAPACK=ON
-		$(cmake-utils_use test Trilinos_ENABLE_TESTS)
-		$(trilinos_enable adolc)
-		$(trilinos_enable arprec)
-		$(trilinos_enable boost Boost)
-		$(trilinos_enable boost BoostLib)
-		$(trilinos_enable cppunit Cppunit)
-		$(trilinos_enable clp Clp)
-		$(trilinos_enable cuda)
-		$(trilinos_enable cuda CUSPARSE)
-		$(trilinos_enable cuda Thrust)
-		$(trilinos_enable eigen Eigen)
-		$(trilinos_enable gtest gtest)
-		$(trilinos_enable glpk)
-		$(trilinos_enable hdf5)
-		$(trilinos_enable hwloc)
-		$(trilinos_enable hypre)
-		$(trilinos_enable matio)
-		$(trilinos_enable metis)
-		$(trilinos_enable mkl)
-		$(trilinos_enable mkl PARDISO_MKL)
-		$(trilinos_enable mumps)
-		$(trilinos_enable netcdf Netcdf)
-		$(trilinos_enable petsc)
-		$(trilinos_enable qd)
-		$(trilinos_enable qt4 QT)
-		$(trilinos_enable scalapack)
-		$(trilinos_enable scalapack BLACS)
-		$(trilinos_enable scotch Scotch)
-		$(trilinos_enable sparse AMD)
-		$(trilinos_enable sparse CSparse)
-		$(trilinos_enable sparse UMFPACK)
-		$(trilinos_enable superlu SuperLU)
-		$(trilinos_enable taucs)
-		$(trilinos_enable tbb)
-		$(trilinos_enable threads Pthread)
-		$(trilinos_enable tvmet)
-		$(trilinos_enable yaml yaml-cpp)
-		$(trilinos_enable zlib Zlib)
-	)
-
-	use eigen && \
-		mycmakeargs+=(
-		-DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3"
-	)
-	use hypre && \
-		mycmakeargs+=(
-		-DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre"
-	)
-	use scotch && \
-		mycmakeargs+=(
-		-DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch"
-	)
-
-	# cxsparse is a rewrite of csparse + extras
-	use sparse && \
-		mycmakeargs+=(
-		-DCSparse_LIBRARY_NAMES="cxsparse"
-	)
-
-	# mandatory blas and lapack
-	trilinos_conf blas BLAS
-	trilinos_conf lapack LAPACK
-	use superlu && trilinos_conf superlu SuperLU
-	use metis && trilinos_conf metis METIS
-
-	# blacs library is included in scalapack these days
-	if use scalapack; then
-		trilinos_conf scalapack SCALAPACK
-		mycmakeargs+=(
-			-DBLACS_LIBRARY_NAMES="scalapack"
-			-DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs"
-		)
-	fi
-
-	# TODO: do we need that line?
-	export CC=mpicc CXX=mpicxx && tc-export CC CXX
-
-	# cmake-utils eclass patches the base directory CMakeLists.txt
-	# which does not work for complex Trilinos CMake modules
-	CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure
-
-	# TODO:
-	# python bindings with python-r1
-	# fix hypre bindings
-	# fix hdf5
-	# cuda/thrust is untested
-	# do we always need mpi? and for all packages: blah[mpi] ?
-	# install docs, examples
-	# see what packages are related, do we need REQUIRED_USE
-	# proper use flags description
-	# add more use flags/packages ?
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# register $(get_libdir)/trilinos in LDPATH so that the dynamic linker
-	# has a chance to pick up the libraries...
-	cat >> "${T}"/99trilinos <<- EOF
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos"
-	EOF
-	doenvd "${T}"/99trilinos
-}

diff --git a/sci-libs/trilinos/trilinos-12.6.4.ebuild b/sci-libs/trilinos/trilinos-12.6.4.ebuild
deleted file mode 100644
index 3beafc449..000000000
--- a/sci-libs/trilinos/trilinos-12.6.4.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs multilib toolchain-funcs
-
-DESCRIPTION="Scientific library collection for large scale problems"
-HOMEPAGE="http://trilinos.sandia.gov/"
-SRC_URI="http://trilinos.org/oldsite/download/files/${P}-Source.tar.gz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD LGPL-2.1"
-SLOT="0"
-
-IUSE="
-	adolc arprec boost clp cppunit cuda eigen glpk gtest hdf5 hwloc hypre
-	matio metis mkl mumps netcdf petsc qd qt4 scalapack scotch sparse
-	superlu taucs tbb test threads tvmet yaml zlib
-"
-
-# TODO: fix export cmake function for tests
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/binutils-libs
-	virtual/blas
-	virtual/lapack
-	virtual/mpi
-	adolc? ( sci-libs/adolc )
-	arprec? ( sci-libs/arprec )
-	boost? ( dev-libs/boost )
-	clp? ( sci-libs/coinor-clp )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
-	eigen? ( dev-cpp/eigen:3 )
-	gtest? ( dev-cpp/gtest )
-	hdf5? ( sci-libs/hdf5[mpi] )
-	hypre? ( sci-libs/hypre )
-	hwloc? ( sys-apps/hwloc )
-	matio? ( sci-libs/matio )
-	mkl? ( sci-libs/mkl )
-	metis? ( || ( sci-libs/parmetis sci-libs/metis ) )
-	mumps? ( sci-libs/mumps )
-	netcdf? ( sci-libs/netcdf )
-	petsc? ( sci-mathematics/petsc )
-	qd? ( sci-libs/qd )
-	qt4? ( dev-qt/qtgui:4 )
-	scalapack? ( virtual/scalapack )
-	scotch? ( sci-libs/scotch )
-	sparse? ( sci-libs/cxsparse sci-libs/umfpack )
-	superlu? ( sci-libs/superlu )
-	taucs? ( sci-libs/taucs )
-	tbb? ( dev-cpp/tbb )
-	tvmet? ( dev-libs/tvmet )
-	yaml? ( dev-cpp/yaml-cpp )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${P}-Source"
-
-trilinos_conf() {
-	local dirs libs d
-	for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
-		dirs="${dirs};${d:2}"
-	done
-	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" )
-	for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
-		libs="${libs};${d:2}"
-	done
-	[[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" )
-	dirs=""
-	for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do
-		dirs="${dirs};${d:2}"
-	done
-	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" )
-}
-
-trilinos_enable() {
-	cmake-utils_use $1 TPL_ENABLE_${2:-${1^^}}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch \
-		"${FILESDIR}"/${PN}-12.6.2-fix_install_paths_for_destdir.patch
-}
-
-src_configure() {
-
-	# temporarily disable SEACAS and pyTrilinos compilation
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"
-		-DTrilinos_ENABLE_ALL_PACKAGES=ON
-		-DTrilinos_ENABLE_SEACAS=OFF
-		-DTrilinos_ENABLE_PyTrilinos=OFF
-		-DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
-		-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
-		-DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
-		-DTPL_ENABLE_BinUtils=ON
-		-DTPL_ENABLE_MPI=ON
-		-DTPL_ENABLE_BLAS=ON
-		-DTPL_ENABLE_LAPACK=ON
-		$(cmake-utils_use test Trilinos_ENABLE_TESTS)
-		$(trilinos_enable adolc)
-		$(trilinos_enable arprec)
-		$(trilinos_enable boost Boost)
-		$(trilinos_enable boost BoostLib)
-		$(trilinos_enable cppunit Cppunit)
-		$(trilinos_enable clp Clp)
-		$(trilinos_enable cuda)
-		$(trilinos_enable cuda CUSPARSE)
-		$(trilinos_enable cuda Thrust)
-		$(trilinos_enable eigen Eigen)
-		$(trilinos_enable gtest gtest)
-		$(trilinos_enable glpk)
-		$(trilinos_enable hdf5)
-		$(trilinos_enable hwloc)
-		$(trilinos_enable hypre)
-		$(trilinos_enable matio)
-		$(trilinos_enable metis)
-		$(trilinos_enable mkl)
-		$(trilinos_enable mkl PARDISO_MKL)
-		$(trilinos_enable mumps)
-		$(trilinos_enable netcdf Netcdf)
-		$(trilinos_enable petsc)
-		$(trilinos_enable qd)
-		$(trilinos_enable qt4 QT)
-		$(trilinos_enable scalapack)
-		$(trilinos_enable scalapack BLACS)
-		$(trilinos_enable scotch Scotch)
-		$(trilinos_enable sparse AMD)
-		$(trilinos_enable sparse CSparse)
-		$(trilinos_enable sparse UMFPACK)
-		$(trilinos_enable superlu SuperLU)
-		$(trilinos_enable taucs)
-		$(trilinos_enable tbb)
-		$(trilinos_enable threads Pthread)
-		$(trilinos_enable tvmet)
-		$(trilinos_enable yaml yaml-cpp)
-		$(trilinos_enable zlib Zlib)
-	)
-
-	use eigen && \
-		mycmakeargs+=(
-		-DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3"
-	)
-	use hypre && \
-		mycmakeargs+=(
-		-DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre"
-	)
-	use scotch && \
-		mycmakeargs+=(
-		-DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch"
-	)
-
-	# cxsparse is a rewrite of csparse + extras
-	use sparse && \
-		mycmakeargs+=(
-		-DCSparse_LIBRARY_NAMES="cxsparse"
-	)
-
-	# mandatory blas and lapack
-	trilinos_conf blas BLAS
-	trilinos_conf lapack LAPACK
-	use superlu && trilinos_conf superlu SuperLU
-	use metis && trilinos_conf metis METIS
-
-	# blacs library is included in scalapack these days
-	if use scalapack; then
-		trilinos_conf scalapack SCALAPACK
-		mycmakeargs+=(
-			-DBLACS_LIBRARY_NAMES="scalapack"
-			-DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs"
-		)
-	fi
-
-	# TODO: do we need that line?
-	export CC=mpicc CXX=mpicxx && tc-export CC CXX
-
-	# cmake-utils eclass patches the base directory CMakeLists.txt
-	# which does not work for complex Trilinos CMake modules
-	CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure
-
-	# TODO:
-	# python bindings with python-r1
-	# fix hypre bindings
-	# fix hdf5
-	# cuda/thrust is untested
-	# do we always need mpi? and for all packages: blah[mpi] ?
-	# install docs, examples
-	# see what packages are related, do we need REQUIRED_USE
-	# proper use flags description
-	# add more use flags/packages ?
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# register $(get_libdir)/trilinos in LDPATH so that the dynamic linker
-	# has a chance to pick up the libraries...
-	cat >> "${T}"/99trilinos <<- EOF
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos"
-	EOF
-	doenvd "${T}"/99trilinos
-}