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

["Justin Lecher" <jlec@gentoo.org>]

commit:     4a75c1497578f224852b2bc4f64fc29763a3dee8
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 13 17:12:28 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Mar 14 08:21:00 2015 +0000
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 <tamiko@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 <tamiko@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