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

2019-08-05 Thread Matthias Maier 
commit: 998f2a2c3f236879ea713a3cf1576d014be15e5c
Author: Matthias Maier  gentoo  org>
AuthorDate: Mon Aug  5 06:43:45 2019 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Mon Aug  5 06:43:45 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=998f2a2c

sci-libs/trilinos: merge into ::gentoo and remove from overlay.

Signed-off-by: Matthias Maier  gentoo.org>

 .../files/trilinos-11.14.1-fix-install-paths.patch |   61 --
 ...nos-12.12.1-fix_install_paths_for_destdir.patch | 1069 
 ...trilinos-12.12.1-fix_sundance_compilation.patch |   33 -
 .../files/trilinos-12.12.1-superlu-5.patch |  161 ---
 ...nos-12.14.1-fix_install_paths_for_destdir.patch |  973 --
 sci-libs/trilinos/metadata.xml |   51 -
 sci-libs/trilinos/trilinos-12.12.1-r1.ebuild   |  206 
 sci-libs/trilinos/trilinos-12.14.1.ebuild  |  207 
 8 files changed, 2761 deletions(-)

diff --git a/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch 
b/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch
deleted file mode 100644
index 32f25f326..0
--- a/sci-libs/trilinos/files/trilinos-11.14.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/core/package_arch/TribitsWriteClientExportFiles.cmake
-+++ b/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
-@@ -494,8 +494,8 @@ 
INCLUDE(\"${PROJECT_BINARY_DIR}/${PACKAGE_NAME}Targets.cmake\")"
-   FOREACH(PATH ${PATH_LIST})
- SET(RELATIVE_PATH "${RELATIVE_PATH}/..")
-   ENDFOREACH()
--  SET(FULL_LIBRARY_DIRS_SET 
"\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_LIB_DIR}")
--  SET(FULL_INCLUDE_DIRS_SET 
"\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
-+  SET(FULL_LIBRARY_DIRS_SET "${${PROJECT_NAME}_INSTALL_LIB_DIR}")
-+  SET(FULL_INCLUDE_DIRS_SET "${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
- 
-   # Custom code in configuration file.
-   SET(PACKAGE_CONFIG_CODE "")
-@@ -574,14 +574,14 @@ 
FUNCTION(TRIBITS_WRITE_PROJECT_CLIENT_EXPORT_FILES_INSTALL_TARGETS PACKAGE_NAME)
-   IF (${PROJECT_NAME}_ENABLE_INSTALL_CMAKE_CONFIG_FILES)
- INSTALL(
-   FILES 
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PACKAGE_NAME}Config_install.cmake
--  DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}"
-+  DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}"
-   RENAME ${PACKAGE_NAME}Config.cmake
-   )
- 
- IF(${PACKAGE_NAME}_HAS_NATIVE_LIBRARIES)
-   INSTALL(
- EXPORT ${PACKAGE_NAME}
--DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}"
-+DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${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-12.12.1-fix_install_paths_for_destdir.patch 
b/sci-libs/trilinos/files/trilinos-12.12.1-fix_install_paths_for_destdir.patch
deleted file mode 100644
index d4e04a438..0
--- 
a/sci-libs/trilinos/files/trilinos-12.12.1-fix_install_paths_for_destdir.patch
+++ /dev/null
@@ -1,1069 +0,0 @@
-diff --git a/commonTools/gtest/CMakeLists.txt

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

2018-08-31 Thread Matthias Maier 
commit: 28d840bc2275b9d2614291ba41d6b1ff93e0ddfe
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri Aug 31 15:38:51 2018 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Fri Aug 31 15:38:51 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=28d840bc

sci-libs/trilinos: fix compilation with superlu 5

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 .../files/trilinos-12.12.1-superlu-5.patch | 161 +
 sci-libs/trilinos/trilinos-12.12.1-r1.ebuild   |   1 +
 2 files changed, 162 insertions(+)

diff --git a/sci-libs/trilinos/files/trilinos-12.12.1-superlu-5.patch 
b/sci-libs/trilinos/files/trilinos-12.12.1-superlu-5.patch
new file mode 100644
index 0..24e8dbabd
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-12.12.1-superlu-5.patch
@@ -0,0 +1,161 @@
+From 83bec239ac6a63ed895a52567eab18925dd6a8cb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= 
+Date: Wed, 1 Jun 2016 19:38:01 +0200
+Subject: [PATCH] compatibility with SuperLU 5
+
+Thanks to Eric Bavier .
+---
+ cmake/TPLs/FindTPLSuperLU.cmake  | 42 +++-
+ packages/amesos/cmake/Amesos_config.h.in |  3 ++
+ packages/amesos/src/Amesos_Superlu.cpp   | 15 ++---
+ packages/ifpack/cmake/Ifpack_config.h.in |  3 ++
+ packages/ifpack/src/Ifpack_SILU.cpp  |  6 +++-
+ packages/ifpack/src/Ifpack_SILU.h|  2 ++
+ 6 files changed, 65 insertions(+), 6 deletions(-)
+
+diff --git a/cmake/TPLs/FindTPLSuperLU.cmake b/cmake/TPLs/FindTPLSuperLU.cmake
+index fae2db230b0..f2321ba93dc 100644
+--- a/cmake/TPLs/FindTPLSuperLU.cmake
 b/cmake/TPLs/FindTPLSuperLU.cmake
+@@ -56,5 +56,45 @@
+ 
+ TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( SuperLU
+   REQUIRED_HEADERS supermatrix.h slu_ddefs.h
+-  REQUIRED_LIBS_NAMES "superlu superlu_3.0 superlu_4.0 superlu_4.1 
superlu_4.2 superlu_4.3"
++  REQUIRED_LIBS_NAMES "superlu superlu_3.0 superlu_4.0 superlu_4.1 
superlu_4.2 superlu_4.3 superlu_5.0"
+   )
++
++include(CheckCSourceCompiles)
++include(MultilineSet)
++
++# API change in SuperLU 5.0 requires a 'GlobalLU_t' parameter for
++# *gssvx, *gsisx, *gstrf, and *gsitrf routines.  Check whether these
++# parameters are needed.
++
++FUNCTION(CHECK_SUPERLU_GLOBALLU_T_ARG  VARNAME)
++  SET(SOURCE
++  "
++#include 
++
++int main()
++{
++  GlobalLU_t lu;
++  superlu_options_t opt;
++  SuperMatrix M;
++  int *i;
++  double *d;
++  void *v;
++  char *c;
++  SuperLUStat_t stat;
++  mem_usage_t mem;
++
++  dgsisx(,,i,i,i,c,d,d,,,v,*i,,,d,di);
++  return 0;
++}
++"
++  )
++
++  SET(CMAKE_REQUIRED_INCLUDES ${TPL_SuperLU_INCLUDE_DIRS})
++  SET(CMAKE_REQUIRED_LIBRARIES ${TPL_SuperLU_LIBRARIES} 
${TPL_METIS_LIBRARIES} ${TPL_BLAS_LIBRARIES})
++  SET(CMAKE_REQUIRED_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
++  CHECK_C_SOURCE_COMPILES("${SOURCE}" ${VARNAME})
++ENDFUNCTION()
++
++IF (TPL_ENABLE_SuperLU)
++  CHECK_SUPERLU_GLOBALLU_T_ARG(HAVE_SUPERLU_GLOBALLU_T_ARG)
++ENDIF(TPL_ENABLE_SuperLU)
+diff --git a/packages/amesos/cmake/Amesos_config.h.in 
b/packages/amesos/cmake/Amesos_config.h.in
+index bc4967e3433..6150ed80d2f 100644
+--- a/packages/amesos/cmake/Amesos_config.h.in
 b/packages/amesos/cmake/Amesos_config.h.in
+@@ -93,3 +93,6 @@
+ 
+ /* Define to 1 if SuperLU_DIST's LUstructInit is declared with 2 arguments. */
+ #cmakedefine HAVE_SUPERLUDIST_LUSTRUCTINIT_2ARG
++
++/* Define to 1 if SuperLU's *gssvx and *gsisx routines need a GlobalLU_t 
argument. */
++#cmakedefine HAVE_SUPERLU_GLOBALLU_T_ARG
+diff --git a/packages/amesos/src/Amesos_Superlu.cpp 
b/packages/amesos/src/Amesos_Superlu.cpp
+index 3651b65f4da..7adf0dff62d 100644
+--- a/packages/amesos/src/Amesos_Superlu.cpp
 b/packages/amesos/src/Amesos_Superlu.cpp
+@@ -55,6 +55,7 @@ class SLUData {
+ #endif
+   SLU::superlu_options_t SLU_options;
+   SLU::mem_usage_t mem_usage;
++  SLU::GlobalLU_t lu;  // Use for gssvx and gsisx in SuperLU 5.0
+   SLU::fact_t refactor_option ; //  SamePattern or 
SamePattern_SameRowPerm
+ 
+   SLUData() {
+@@ -480,8 +481,11 @@ int Amesos_Superlu::NumericFactorization()
+ _c_[0], _r_[0], _[0], _, _[0],
+ _[0], &(data_->L), &(data_->U), NULL, 0,
+ &(data_->B), &(data_->X), , , _[0],
+-_[0], &(data_->mem_usage), _stat,
+-[0] );
++_[0],
++#ifdef HAVE_SUPERLU_GLOBALLU_T_ARG
++&(data_->lu),
++#endif
++&(data_->mem_usage), _stat, [0] );
+ SLU::StatFree( _stat ) ;
+   }
+ 
+@@ -611,8 +615,11 @@ int Amesos_Superlu::Solve()
+ _c_[0], _r_[0], _[0], _, _[0],
+ _[0], &(data_->L), &(data_->U), NULL, 0,
+ &(data_->B), &(data_->X), , , _[0],
+-_[0], &(data_->mem_usage), _stat,
+-);
++_[0],
++#ifdef HAVE_SUPERLU_GLOBALLU_T_ARG
++&(data_->lu),
++#endif
++&(data_->mem_usage), _stat, );
+ //assert( equed_ == 'N' ) ;
+ StatFree( _stat ) ;
+   }
+diff --git

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

2018-04-02 Thread Justin Lecher 
commit: 7185e731bd07735474852ee3669ddc764ef6e7e2
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Apr  2 12:42:39 2018 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Apr  2 12:45:22 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7185e731

sci-libs/trilinos: Drop old

Signed-off-by: Justin Lecher  gentoo.org>
Package-Manager: Portage-2.3.27, Repoman-2.3.9
Signed-off-by: Justin Lecher  gentoo.org>

 ...nos-11.14.1-fix_install_paths_for_destdir.patch | 617 -
 .../files/trilinos-12.10.1-fix_gcc_7.patch |  57 --
 ...s-12.10.1-fix_install_paths_for_destdir-2.patch |  10 -
 ...nos-12.10.1-fix_install_paths_for_destdir.patch | 603 
 sci-libs/trilinos/trilinos-11.14.1-r1.ebuild   | 207 ---
 sci-libs/trilinos/trilinos-12.10.1-r1.ebuild   | 220 
 6 files changed, 1714 deletions(-)

diff --git 
a/sci-libs/trilinos/files/trilinos-11.14.1-fix_install_paths_for_destdir.patch 
b/sci-libs/trilinos/files/trilinos-11.14.1-fix_install_paths_for_destdir.patch
deleted file mode 100644
index e24fc495b..0
--- 
a/sci-libs/trilinos/files/trilinos-11.14.1-fix_install_paths_for_destdir.patch
+++ /dev/null
@@ -1,617 +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/TPL/CMakeLists.txt 
b/packages/kokkos/TPL/CMakeLists.txt
-index 8119c31..2d74336 100644
 a/packages/kokkos/TPL/CMakeLists.txt
-+++ b/packages/kokkos/TPL/CMakeLists.txt
-@@ -1,7 +1,7 @@
- 
- TRIBITS_SUBPACKAGE(TPL)
- 
--SET(TRILINOS_INCDIR 
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
- 
- IF( Kokkos_ENABLE_Cuda )
- 
-diff --git a/packages/kokkos/containers/src/CMakeLists.txt 
b/packages/kokkos/containers/src/CMakeLists.txt
-index da5a791..65a7c76 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 7e0e150..d1ed33a 100644
 a/packages/kokkos/core/src/CMakeLists.txt
-+++ b/packages/kokkos/core/src/CMakeLists.txt
-@@ -13,7 +13,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..1021f42 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

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

2017-07-14 Thread Matthias Maier 
commit: 29c5e3f5de195abd749fb096f476cf833c0cb08a
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri Jul 14 18:20:23 2017 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Fri Jul 14 18:20:23 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=29c5e3f5

sci-libs/trilinos: fix compilation with gcc-7

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../files/trilinos-12.10.1-fix_gcc_7.patch | 57 ++
 sci-libs/trilinos/trilinos-12.10.1-r1.ebuild   |  3 +-
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/sci-libs/trilinos/files/trilinos-12.10.1-fix_gcc_7.patch 
b/sci-libs/trilinos/files/trilinos-12.10.1-fix_gcc_7.patch
new file mode 100644
index 0..cb005cbd3
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-12.10.1-fix_gcc_7.patch
@@ -0,0 +1,57 @@
+diff --git a/packages/stk/stk_util/stk_util/diag/StringUtil.cpp 
b/packages/stk/stk_util/stk_util/diag/StringUtil.cpp
+index eb9c7c1..942cfad 100644
+--- a/packages/stk/stk_util/stk_util/diag/StringUtil.cpp
 b/packages/stk/stk_util/stk_util/diag/StringUtil.cpp
+@@ -40,7 +40,7 @@
+ #include// for basic_string, string, etc
+ #include "stk_util/diag/String.hpp" // for String
+ 
+-#if __GNUC__ == 3 || __GNUC__ == 4 || __GNUC__ == 5 || __GNUC__ == 6
++#if __GNUC__ == 3 || __GNUC__ == 4 || __GNUC__ == 5 || __GNUC__ == 6 || 
__GNUC__ == 7
+ #include 
+ #endif
+ 
+@@ -314,7 +314,7 @@ word_wrap(
+   #endif
+   }
+ 
+-#elif (__GNUC__ == 5)
++#elif (__GNUC__ >= 5)
+   std::string
+   demangle(const char * symbol)
+   {
+@@ -338,33 +338,8 @@ word_wrap(
+ return s;
+   #endif
+   }
+-  
+-#elif (__GNUC__ == 6)
+-  std::string
+-  demangle(const char * symbol)
+-  {
+-  #ifdef PURIFY_BUILD
+-return symbol;
+-  #else
+-std::string s;
+-
+-int status = -1;
+-
+-char *demangled_symbol = abi::__cxa_demangle(symbol, 0, 0, );
+ 
+-if (demangled_symbol) {
+-  s = std::string(demangled_symbol);
+-  free(demangled_symbol);
+-}
+-
+-if (status != 0)
+-  s = std::string(symbol);
+-
+-return s;
+-  #endif
+-  }
+-  
+-#endif // (__GNUC__ == 3)
++#endif
+ 
+ #else
+ 

diff --git a/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild 
b/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild
index f577e1f5d..b43aabad7 100644
--- a/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild
@@ -85,7 +85,8 @@ trilinos_enable() {
 src_prepare() {
epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch \
"${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch \
-   "${FILESDIR}"/${P}-fix_install_paths_for_destdir-2.patch
+   "${FILESDIR}"/${P}-fix_install_paths_for_destdir-2.patch \
+   "${FILESDIR}"/${P}-fix_gcc_7.patch
 
epatch_user
 }

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

2015-08-28 Thread Justin Lecher 
commit: 7c08fa53726b7d30ddb14525596a1ca468007fc3
Author: Matthias Maier tamiko AT gentoo DOT org
AuthorDate: Thu Aug 27 20:36:32 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Thu Aug 27 20:36:32 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7c08fa53

sci-libs/trilinos: compilation fixes for 12.2.1

Package-Manager: portage-2.2.20.1

 sci-libs/trilinos/ChangeLog|  4 ++
 .../files/trilinos-12.2.1-compilation_fixes.patch  | 43 ++
 sci-libs/trilinos/trilinos-12.2.1.ebuild   |  5 ++-
 3 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index 4957c5c..1aabfdf 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  27 Aug 2015; Matthias Maier tam...@gentoo.org
+  +files/trilinos-12.2.1-compilation_fixes.patch, trilinos-12.2.1.ebuild:
+  sci-libs/trilinos: compilation fixes for 12.2.1
+
 *trilinos-12.2.1 (27 Aug 2015)
 
   27 Aug 2015; Matthias Maier tam...@gentoo.org +trilinos-12.2.1.ebuild:

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
new file mode 100644
index 000..a77a8dc
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-12.2.1-compilation_fixes.patch
@@ -0,0 +1,43 @@
+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/trilinos-12.2.1.ebuild 
b/sci-libs/trilinos/trilinos-12.2.1.ebuild
index b090b96..5862e73 100644
--- a/sci-libs/trilinos/trilinos-12.2.1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.2.1.ebuild
@@ -82,8 +82,9 @@ trilinos_enable() {
 }
 
 src_prepare() {
-   epatch ${FILESDIR}/${PN}-11.14.1-fix-install-paths.patch
-   epatch ${FILESDIR}/${PN}-12.0.1-fix_install_paths_for_destdir.patch
+   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() {

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

2015-07-16 Thread Jauhien Piatlicki 
commit: ee9b4a37b7e726a35182f379fa0239f66a90401e
Author: Matthias Maier tamiko AT gentoo DOT org
AuthorDate: Mon Jul 13 03:05:30 2015 +
Commit: Jauhien Piatlicki jauhien AT gentoo DOT org
CommitDate: Mon Jul 13 03:05:30 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=ee9b4a37

sci-libs/trilinos: drop old; version bump

Package-Manager: portage-2.2.20

 sci-libs/trilinos/ChangeLog|   9 +
 .../files/trilinos-11.0.3-fix-install-paths.patch  |  76 ---
 .../files/trilinos-11.2.3-fix-install-paths.patch  |  62 --
 ...inos-12.0.1-fix_install_paths_for_destdir.patch | 654 +
 sci-libs/trilinos/trilinos-11.0.3.ebuild   | 128 
 sci-libs/trilinos/trilinos-11.2.3-r1.ebuild|   1 -
 ...ilinos-11.4.2.ebuild = trilinos-12.0.1.ebuild} |  15 +-
 7 files changed, 673 insertions(+), 272 deletions(-)

diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index b773567..f5d1ce5 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*trilinos-12.0.1 (13 Jul 2015)
+
+  13 Jul 2015; Matthias Maier tam...@gentoo.org
+  +files/trilinos-12.0.1-fix_install_paths_for_destdir.patch,
+  +trilinos-12.0.1.ebuild, -files/trilinos-11.0.3-fix-install-paths.patch,
+  -files/trilinos-11.2.3-fix-install-paths.patch, -trilinos-11.0.3.ebuild,
+  -trilinos-11.2.3-r1.ebuild, -trilinos-11.4.2.ebuild:
+  sci-libs/trilinos: drop old; version bump
+
 *trilinos-11.12.1-r1 (13 Mar 2015)
 *trilinos-11.14.1-r1 (13 Mar 2015)
 

diff --git a/sci-libs/trilinos/files/trilinos-11.0.3-fix-install-paths.patch 
b/sci-libs/trilinos/files/trilinos-11.0.3-fix-install-paths.patch
deleted file mode 100644
index 8ec15a4..000
--- a/sci-libs/trilinos/files/trilinos-11.0.3-fix-install-paths.patch
+++ /dev/null
@@ -1,76 +0,0 @@
 a/cmake/tribits/package_arch/TribitsGlobalMacros.cmake   2013-04-03 
11:00:54.342539245 +0200
-+++ b/cmake/tribits/package_arch/TribitsGlobalMacros.cmake   2013-04-03 
11:04:30.283837064 +0200
-@@ -209,26 +209,6 @@
- ADVANCED_SET(${PROJECT_NAME}_LINK_SEARCH_START_STATIC OFF CACHE BOOL
-   If on, then the properter LINK_SEARCH_START_STATIC will be added to 
all executables. )
-   ENDIF()
--  
--  ADVANCED_SET(${PROJECT_NAME}_INSTALL_INCLUDE_DIR include
--CACHE PATH
--Location where the headers will be installed.  If given as a relative 
path, it will be relative to ${CMAKE_INSTALL_PREFIX}.  If given as an absolute 
path, it will used as such.  Default is 'include'
--)
--  
--  ADVANCED_SET(${PROJECT_NAME}_INSTALL_LIB_DIR lib
--CACHE PATH
--Location where the libraries will be installed.  If given as a relative 
path, it will be relative to ${CMAKE_INSTALL_PREFIX}.  If given as an absolute 
path, it will used as such.  Default is 'lib'
--)
--  
--  ADVANCED_SET(${PROJECT_NAME}_INSTALL_RUNTIME_DIR bin
--CACHE PATH
--Location where the runtime DLLs and designated programs will be 
installed.  If given as a relative path, it will be relative to 
${CMAKE_INSTALL_PREFIX}.  If given as an absolute path, it will used as such.  
Default is 'bin'
--)
--  
--  ADVANCED_SET(${PROJECT_NAME}_INSTALL_EXAMPLE_DIR example
--CACHE PATH
--Location where assorted examples will be installed.  If given as a 
relative path, it will be relative to ${CMAKE_INSTALL_PREFIX}.  If given as an 
absolute path, it will used as such.  Default is 'example'
--)
- 
-   IF (${${PROJECT_NAME}_INSTALL_LIBRARIES_AND_HEADERS_DEFAULT} STREQUAL )
- # Assume the TriBITS project wants to install headers and libraries by 
default
 a/cmake/tribits/package_arch/TribitsPackageWritePackageConfig.cmake
2012-11-12 14:58:00.0 +0100
-+++ b/cmake/tribits/package_arch/TribitsPackageWritePackageConfig.cmake
2012-11-12 14:42:47.0 +0100
-@@ -367,7 +367,7 @@
- 
-   INSTALL(
- FILES 
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PACKAGE_NAME}Config_install.cmake
--DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}
-+DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}
- RENAME ${PACKAGE_NAME}Config.cmake
-   )
- 
-@@ -563,7 +563,7 @@
-   IF(HAS_INSTALL_TARGETS)
- INSTALL(
-   EXPORT ${PROJECT_NAME}
--  DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}
-+  DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}
-   FILE ${PROJECT_NAME}Targets.cmake
-   )
- # Import the targets in applications.
-@@ -589,7 +589,7 @@
- 
-   INSTALL(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config_install.cmake
--DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}
-+DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}
- RENAME ${PROJECT_NAME}Config.cmake
-   )
-   
-@@ -632,7 +632,7 @@
- 
-   INSTALL(
- FILES

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

2015-03-14 Thread Justin Lecher 
commit: c1b9f99c452b2bdade304ce3d1ea0e1da52f4046
Author: Matthias Maier tamiko AT gentoo DOT org
AuthorDate: Fri Mar 13 16:50:29 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Fri Mar 13 16:50:29 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c1b9f99c

sci-libs/trilinos: version bump, some preliminary metadata

Package-Manager: portage-2.2.15

 sci-libs/trilinos/ChangeLog|   8 +
 .../files/trilinos-11.14.1-fix-install-paths.patch |  61 ++
 ...nos-11.14.1-fix_install_paths_for_destdir.patch | 617 +
 sci-libs/trilinos/metadata.xml |  73 +--
 sci-libs/trilinos/trilinos-11.14.1.ebuild  | 207 +++
 5 files changed, 931 insertions(+), 35 deletions(-)

diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index ed2de56..1e694b5 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*trilinos-11.14.1 (13 Mar 2015)
+
+  13 Mar 2015; Matthias Maier tam...@gentoo.org
+  +files/trilinos-11.14.1-fix-install-paths.patch,
+  +files/trilinos-11.14.1-fix_install_paths_for_destdir.patch,
+  +trilinos-11.14.1.ebuild, metadata.xml:
+  sci-libs/trilinos: version bump, some preliminary metadata
+
   19 Feb 2015; Christoph Junghans ott...@gentoo.org trilinos-11.0.3.ebuild,
   trilinos-11.10.2.ebuild, trilinos-11.12.1.ebuild, trilinos-11.4.2.ebuild:
   BSD/LGPL-2.1 never implies a fetch restriction, updated Manifest

diff --git a/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch 
b/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch
new file mode 100644
index 000..acfe4bb
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch
@@ -0,0 +1,61 @@
+diff --git a/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake 
b/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake
+index e1c633f..864488f 100644
+--- a/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
 b/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
+@@ -494,8 +494,8 @@ 
INCLUDE(\${PROJECT_BINARY_DIR}/${PACKAGE_NAME}Targets.cmake\)
+   FOREACH(PATH ${PATH_LIST})
+ SET(RELATIVE_PATH ${RELATIVE_PATH}/..)
+   ENDFOREACH()
+-  SET(FULL_LIBRARY_DIRS_SET 
\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_LIB_DIR})
+-  SET(FULL_INCLUDE_DIRS_SET 
\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++  SET(FULL_LIBRARY_DIRS_SET ${${PROJECT_NAME}_INSTALL_LIB_DIR})
++  SET(FULL_INCLUDE_DIRS_SET ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ 
+   # Custom code in configuration file.
+   SET(PACKAGE_CONFIG_CODE )
+@@ -574,14 +574,14 @@ 
FUNCTION(TRIBITS_WRITE_PROJECT_CLIENT_EXPORT_FILES_INSTALL_TARGETS PACKAGE_NAME)
+   IF (${PROJECT_NAME}_ENABLE_INSTALL_CMAKE_CONFIG_FILES)
+ INSTALL(
+   FILES 
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PACKAGE_NAME}Config_install.cmake
+-  DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}
++  DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}
+   RENAME ${PACKAGE_NAME}Config.cmake
+   )
+ 
+ IF(${PACKAGE_NAME}_HAS_NATIVE_LIBRARIES)
+   INSTALL(
+ EXPORT ${PACKAGE_NAME}
+-DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}
++DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}
+ FILE ${PACKAGE_NAME}Targets.cmake
+ )
+ ENDIF()
+@@ -819,8 +819,8 @@ 
include(\${${TRIBITS_PACKAGE}_BINARY_DIR}/${TRIBITS_PACKAGE}Config.cmake\))
+   FOREACH(PATH ${PATH_LIST})
+ SET(RELATIVE_PATH ${RELATIVE_PATH}/..)
+   ENDFOREACH()
+-  SET(${PROJECT_NAME}_CONFIG_INCLUDE_DIRS 
\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+-  SET(${PROJECT_NAME}_CONFIG_LIBRARY_DIRS 
\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_LIB_DIR})
++  SET(${PROJECT_NAME}_CONFIG_INCLUDE_DIRS 
${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++  SET(${PROJECT_NAME}_CONFIG_LIBRARY_DIRS 
${${PROJECT_NAME}_INSTALL_LIB_DIR})
+ 
+   # Write the specification of the rpath if necessary. This is only needed if 
we're building shared libraries.
+   IF(BUILD_SHARED_LIBS)
+@@ -845,7 +845,7 @@ 
include(\\${CMAKE_CURRENT_LIST_DIR}/../${TRIBITS_PACKAGE}/${TRIBITS_PACKAGE}Con
+ 
+ INSTALL(
+   FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config_install.cmake
+-  DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}
++  DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}
+   RENAME ${PROJECT_NAME}Config.cmake
+   )
+   ENDIF()
+@@ -890,7 +890,7 @@ 
include(\\${CMAKE_CURRENT_LIST_DIR}/../${TRIBITS_PACKAGE}/${TRIBITS_PACKAGE}Con
+ )
+   INSTALL(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+-

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

2015-03-14 Thread Justin Lecher 
commit: 4a75c1497578f224852b2bc4f64fc29763a3dee8
Author: Matthias Maier tamiko AT gentoo DOT org
AuthorDate: Fri Mar 13 17:12:28 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Sat Mar 14 08:21:00 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4a75c149

sci-libs/trilinos: fix location of target config files

Package-Manager: portage-2.2.15

 sci-libs/trilinos/ChangeLog  | 9 +
 sci-libs/trilinos/files/trilinos-11.12.1-fix-install-paths.patch | 2 +-
 sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch | 2 +-
 .../{trilinos-11.12.1.ebuild = trilinos-11.12.1-r1.ebuild}  | 0
 .../{trilinos-11.14.1.ebuild = trilinos-11.14.1-r1.ebuild}  | 0
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index 1e694b5..b773567 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*trilinos-11.12.1-r1 (13 Mar 2015)
+*trilinos-11.14.1-r1 (13 Mar 2015)
+
+  13 Mar 2015; Matthias Maier tam...@gentoo.org +trilinos-11.12.1-r1.ebuild,
+  +trilinos-11.14.1-r1.ebuild, -trilinos-11.12.1.ebuild,
+  -trilinos-11.14.1.ebuild, files/trilinos-11.12.1-fix-install-paths.patch,
+  files/trilinos-11.14.1-fix-install-paths.patch:
+  sci-libs/trilinos: fix location of target config files
+
 *trilinos-11.14.1 (13 Mar 2015)
 
   13 Mar 2015; Matthias Maier tam...@gentoo.org

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
index 130f3ce..9a02292 100644
--- 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
@@ -26,7 +26,7 @@ index e1c633f..864488f 100644
INSTALL(
  EXPORT ${PACKAGE_NAME}
 -DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}
-+DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}
++DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}
  FILE ${PACKAGE_NAME}Targets.cmake
  )
  ENDIF()

diff --git a/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch 
b/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch
index acfe4bb..32f25f3 100644
--- a/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch
+++ b/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch
@@ -26,7 +26,7 @@ index e1c633f..864488f 100644
INSTALL(
  EXPORT ${PACKAGE_NAME}
 -DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}
-+DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}
++DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}
  FILE ${PACKAGE_NAME}Targets.cmake
  )
  ENDIF()

diff --git a/sci-libs/trilinos/trilinos-11.12.1.ebuild 
b/sci-libs/trilinos/trilinos-11.12.1-r1.ebuild
similarity index 100%
rename from sci-libs/trilinos/trilinos-11.12.1.ebuild
rename to sci-libs/trilinos/trilinos-11.12.1-r1.ebuild

diff --git a/sci-libs/trilinos/trilinos-11.14.1.ebuild 
b/sci-libs/trilinos/trilinos-11.14.1-r1.ebuild
similarity index 100%
rename from sci-libs/trilinos/trilinos-11.14.1.ebuild
rename to sci-libs/trilinos/trilinos-11.14.1-r1.ebuild

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

2015-03-14 Thread Justin Lecher 
commit: a3f515f117bad10a727444fcf6b2ceae29e15460
Author: Matthias Maier tamiko AT gentoo DOT org
AuthorDate: Fri Mar 13 17:12:28 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Fri Mar 13 17:12:28 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a3f515f1

sci-libs/trilinos: fix location of target config files

Package-Manager: portage-2.2.15

 sci-libs/trilinos/ChangeLog  | 9 +
 sci-libs/trilinos/files/trilinos-11.12.1-fix-install-paths.patch | 2 +-
 sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch | 2 +-
 .../{trilinos-11.12.1.ebuild = trilinos-11.12.1-r1.ebuild}  | 0
 .../{trilinos-11.14.1.ebuild = trilinos-11.14.1-r1.ebuild}  | 0
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index 1e694b5..b773567 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*trilinos-11.12.1-r1 (13 Mar 2015)
+*trilinos-11.14.1-r1 (13 Mar 2015)
+
+  13 Mar 2015; Matthias Maier tam...@gentoo.org +trilinos-11.12.1-r1.ebuild,
+  +trilinos-11.14.1-r1.ebuild, -trilinos-11.12.1.ebuild,
+  -trilinos-11.14.1.ebuild, files/trilinos-11.12.1-fix-install-paths.patch,
+  files/trilinos-11.14.1-fix-install-paths.patch:
+  sci-libs/trilinos: fix location of target config files
+
 *trilinos-11.14.1 (13 Mar 2015)
 
   13 Mar 2015; Matthias Maier tam...@gentoo.org

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
index 130f3ce..9a02292 100644
--- 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
@@ -26,7 +26,7 @@ index e1c633f..864488f 100644
INSTALL(
  EXPORT ${PACKAGE_NAME}
 -DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}
-+DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}
++DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}
  FILE ${PACKAGE_NAME}Targets.cmake
  )
  ENDIF()

diff --git a/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch 
b/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch
index acfe4bb..32f25f3 100644
--- a/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch
+++ b/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch
@@ -26,7 +26,7 @@ index e1c633f..864488f 100644
INSTALL(
  EXPORT ${PACKAGE_NAME}
 -DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}
-+DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}
++DESTINATION ${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}
  FILE ${PACKAGE_NAME}Targets.cmake
  )
  ENDIF()

diff --git a/sci-libs/trilinos/trilinos-11.12.1.ebuild 
b/sci-libs/trilinos/trilinos-11.12.1-r1.ebuild
similarity index 100%
rename from sci-libs/trilinos/trilinos-11.12.1.ebuild
rename to sci-libs/trilinos/trilinos-11.12.1-r1.ebuild

diff --git a/sci-libs/trilinos/trilinos-11.14.1.ebuild 
b/sci-libs/trilinos/trilinos-11.14.1-r1.ebuild
similarity index 100%
rename from sci-libs/trilinos/trilinos-11.14.1.ebuild
rename to sci-libs/trilinos/trilinos-11.14.1-r1.ebuild