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

["Andrea Arteaga" <andyspiros@gmail.com>]

commit:     b56b7b4f7966a5434723ed52dd097d0d41a54f4f
Author:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
AuthorDate: Sun Apr  8 23:19:09 2012 +0000
Commit:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Sun Apr  8 23:19:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b56b7b4f

[sci-libs/trilinos] Solved many issues.

---
 sci-libs/trilinos/ChangeLog               |    4 ++
 sci-libs/trilinos/trilinos-10.10.1.ebuild |   55 +++--------------------------
 2 files changed, 9 insertions(+), 50 deletions(-)

diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index ad9f45d..6c94090 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  9 Apr 2012; Andrea Arteaga <andyspiros@gmail.com>
+  trilinos-10.10.1.ebuild +metadata.xml:
+  Solved many issues.
+
 *trilinos-10.10.1 (8 Apr 2012)
 
   8 Apr 2012; Andrea Arteaga <andyspiros@gmail.com>

diff --git a/sci-libs/trilinos/trilinos-10.10.1.ebuild b/sci-libs/trilinos/trilinos-10.10.1.ebuild
index 9cae14b..7b964e4 100644
--- a/sci-libs/trilinos/trilinos-10.10.1.ebuild
+++ b/sci-libs/trilinos/trilinos-10.10.1.ebuild
@@ -68,6 +68,11 @@ src_configure() {
 	mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
 		-DTrilinos_ENABLE_ALL_PACKAGES=ON
+		
+		# Directories (workaround for generating correct Makefiles and CMakefiles)
+		-DCMAKE_INSTALL_PREFIX="/"
+		-DTrilinos_INSTALL_INCLUDE_DIR="/usr/include/trilinos"
+		-DTrilinos_INSTALL_LIB_DIR="/usr/$(get_libdir)/trilinos"
 
 		# Tests
 		$(cmake-utils_use test Trilinos_ENABLE_TESTS)
@@ -104,53 +109,3 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
-
-src_compile() {
-    cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local k
-	local fname
-	local libpath
-	local tpkg
-
-	# Edit cmake files
-	libpath="/usr/$(get_libdir)/Trilinos"
-	pushd "${D}/usr/lib/cmake"
-	for i in *; do
-	fname="${i}/${i}Config.cmake"
-
-	k=$(grep -n "${i}_INCLUDE_DIRS" "${fname}" | sed 's/\([0-9]*\):.*/\1/')
-	sed "${k}s|/usr/include|/usr/include/Trilinos|" < "${fname}" > "${fname}.temp"
-
-	k=$(grep -n "${i}_LIBRARY_DIRS" "${fname}" | sed 's/\([0-9]*\):.*/\1/')
-	sed "${k}s|/usr/lib|${libpath}|" < "${fname}.temp" > "${fname}"
-
-	rm "${fname}.temp"
-	done
-	popd
-
-	# Edit Makefiles
-	pushd "${D}/usr/include"
-	for i in Makefile.export.*; do
-	tpkg="$(echo ${i} | sed 's/Makefile.export.//')"
-
-	sed "s|${tpkg}_INCLUDE_DIRS= -I/usr/include|${tpkg}_INCLUDE_DIRS= -I/usr/include/Trilinos|" < "Makefile.export.${tpkg}" > "Makefile.export.${tpkg}.temp"
-	sed "s|${tpkg}_LIBRARY_DIRS= -L/usr/lib|${tpkg}_LIBRARY_DIRS= -L${libpath}|" < "Makefile.export.${tpkg}.temp" > "Makefile.export.${tpkg}"
-	rm "Makefile.export.${tpkg}.temp"
-	done
-	popd
-
-
-	# Move libraries
-	mkdir -p "${D}/${libpath}"
-	mv ${D}usr/lib/*.so "${D}/${libpath}"
-
-	# Move headers
-	mkdir "${T}/headers"
-	mv ${D}usr/include/* "${T}/headers"
-	mv "${T}/headers" "${D}/usr/include/Trilinos"
-}