public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2015-02-19 21:12 Christoph Junghans
  0 siblings, 0 replies; 26+ messages in thread
From: Christoph Junghans @ 2015-02-19 21:12 UTC (permalink / raw
  To: gentoo-commits

commit:     f4f4d2467489fa51f2d0b9c53a9cc2db11ba154a
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 19 21:08:09 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Feb 19 21:08:09 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f4f4d246

BSD/LGPL-2.1 never implies a fetch restriction, updated Manifest

Package-Manager: portage-2.2.14

---
 sci-libs/trilinos/ChangeLog               | 6 +++++-
 sci-libs/trilinos/trilinos-11.0.3.ebuild  | 6 ++----
 sci-libs/trilinos/trilinos-11.10.2.ebuild | 6 +++---
 sci-libs/trilinos/trilinos-11.12.1.ebuild | 6 +++---
 sci-libs/trilinos/trilinos-11.4.2.ebuild  | 6 +++---
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index 82242b8..ed2de56 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/trilinos
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Feb 2015; Christoph Junghans <ottxor@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
+
 *trilinos-11.12.1 (06 Dec 2014)
 
   06 Dec 2014; Matthias Maier <tamiko@gentoo.org>

diff --git a/sci-libs/trilinos/trilinos-11.0.3.ebuild b/sci-libs/trilinos/trilinos-11.0.3.ebuild
index e50a2e1..7075a10 100644
--- a/sci-libs/trilinos/trilinos-11.0.3.ebuild
+++ b/sci-libs/trilinos/trilinos-11.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,7 +8,7 @@ inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="Scientific library collection for large scale problems"
 HOMEPAGE="http://trilinos.sandia.gov/"
-SRC_URI="${P}-Source.tar.gz"
+SRC_URI="http://trilinos.org/oldsite/download/files/${P}-Source.tar.gz"
 SRC_PAGE="11.0"
 
 SLOT="0"
@@ -16,8 +16,6 @@ LICENSE="BSD LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 IUSE="arprec boost cuda hdf5 hwloc netcdf qd qt4 scotch taucs tbb test umfpack zlib"
 
-RESTRICT="fetch"
-
 RDEPEND="
 	virtual/blas
 	virtual/lapack

diff --git a/sci-libs/trilinos/trilinos-11.10.2.ebuild b/sci-libs/trilinos/trilinos-11.10.2.ebuild
index 39f3a44..56696fa 100644
--- a/sci-libs/trilinos/trilinos-11.10.2.ebuild
+++ b/sci-libs/trilinos/trilinos-11.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,7 +8,7 @@ inherit cmake-utils toolchain-funcs multilib toolchain-funcs
 
 DESCRIPTION="Scientific library collection for large scale problems"
 HOMEPAGE="http://trilinos.sandia.gov/"
-SRC_URI="${P}-Source.tar.bz2"
+SRC_URI="http://trilinos.org/oldsite/download/files/${P}-Source.tar.gz"
 
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
@@ -23,7 +23,7 @@ IUSE="
 "
 
 # TODO: fix export cmake function for tests
-RESTRICT="test fetch"
+RESTRICT="test"
 
 RDEPEND="
 	virtual/blas

diff --git a/sci-libs/trilinos/trilinos-11.12.1.ebuild b/sci-libs/trilinos/trilinos-11.12.1.ebuild
index 51734a4..237bcf4 100644
--- a/sci-libs/trilinos/trilinos-11.12.1.ebuild
+++ b/sci-libs/trilinos/trilinos-11.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,7 +8,7 @@ inherit cmake-utils toolchain-funcs multilib toolchain-funcs
 
 DESCRIPTION="Scientific library collection for large scale problems"
 HOMEPAGE="http://trilinos.sandia.gov/"
-SRC_URI="${P}-Source.tar.bz2"
+SRC_URI="http://trilinos.org/oldsite/download/files/${P}-Source.tar.gz"
 
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
@@ -23,7 +23,7 @@ IUSE="
 "
 
 # TODO: fix export cmake function for tests
-RESTRICT="test fetch"
+RESTRICT="test"
 
 RDEPEND="
 	virtual/blas

diff --git a/sci-libs/trilinos/trilinos-11.4.2.ebuild b/sci-libs/trilinos/trilinos-11.4.2.ebuild
index 51734a4..237bcf4 100644
--- a/sci-libs/trilinos/trilinos-11.4.2.ebuild
+++ b/sci-libs/trilinos/trilinos-11.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,7 +8,7 @@ inherit cmake-utils toolchain-funcs multilib toolchain-funcs
 
 DESCRIPTION="Scientific library collection for large scale problems"
 HOMEPAGE="http://trilinos.sandia.gov/"
-SRC_URI="${P}-Source.tar.bz2"
+SRC_URI="http://trilinos.org/oldsite/download/files/${P}-Source.tar.gz"
 
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
@@ -23,7 +23,7 @@ IUSE="
 "
 
 # TODO: fix export cmake function for tests
-RESTRICT="test fetch"
+RESTRICT="test"
 
 RDEPEND="
 	virtual/blas


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2019-05-15 16:34 Matthias Maier
  0 siblings, 0 replies; 26+ messages in thread
From: Matthias Maier @ 2019-05-15 16:34 UTC (permalink / raw
  To: gentoo-commits

commit:     e810192b2f8b7ec866fad23c69fb187e0bf7cb6f
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 16:32:11 2019 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed May 15 16:32:11 2019 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=e810192b

sci-libs/trilinos: fix install phase

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sci-libs/trilinos/trilinos-12.14.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/trilinos/trilinos-12.14.1.ebuild b/sci-libs/trilinos/trilinos-12.14.1.ebuild
index efe37db93..5d87f33fe 100644
--- a/sci-libs/trilinos/trilinos-12.14.1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.14.1.ebuild
@@ -191,7 +191,7 @@ src_install() {
 	cmake-utils_src_install
 
 	# Clean up the mess:
-	rm -r "${ED}"/TrilinosRepoVersion.txt "${ED}"/lib || die "rm failed"
+	rm "${ED}"/TrilinosRepoVersion.txt
 	mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
 
 	#


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2018-04-03  3:52 Matthias Maier
  0 siblings, 0 replies; 26+ messages in thread
From: Matthias Maier @ 2018-04-03  3:52 UTC (permalink / raw
  To: gentoo-commits

commit:     de40804228315f732a8ebe579519c8caa65a47af
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  2 20:57:24 2018 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Apr  3 03:52:05 2018 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=de408042

sci-libs/trilinos: remove qt4 use flag

I have no idea what graphical interface is constructed when qt support
is enabled but it isn't essential for trilinos at all and Trilinos
doesn't support Qt5... So let's just remove that.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 .../trilinos/{trilinos-12.12.1.ebuild => trilinos-12.12.1-r1.ebuild}  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sci-libs/trilinos/trilinos-12.12.1.ebuild b/sci-libs/trilinos/trilinos-12.12.1-r1.ebuild
similarity index 97%
rename from sci-libs/trilinos/trilinos-12.12.1.ebuild
rename to sci-libs/trilinos/trilinos-12.12.1-r1.ebuild
index bdf76c3e9..b74f3c8c6 100644
--- a/sci-libs/trilinos/trilinos-12.12.1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.12.1-r1.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 
 IUSE="
 	adolc arprec boost clp cppunit cuda eigen glpk gtest hdf5 hwloc hypre
-	matio metis mkl mumps netcdf petsc qd qt5 scalapack scotch sparse
+	matio metis mkl mumps netcdf petsc qd scalapack scotch sparse
 	superlu taucs tbb test threads tvmet yaml zlib X
 "
 
@@ -45,7 +45,6 @@ RDEPEND="
 	netcdf? ( sci-libs/netcdf )
 	petsc? ( sci-mathematics/petsc )
 	qd? ( sci-libs/qd )
-	qt5? ( dev-qt/qtgui:5= )
 	scalapack? ( virtual/scalapack )
 	scotch? ( sci-libs/scotch )
 	sparse? ( sci-libs/cxsparse sci-libs/umfpack )
@@ -128,7 +127,6 @@ src_configure() {
 		-DTPL_ENABLE_PETSC="$(usex petsc)"
 		-DTPL_ENABLE_Pthread="$(usex threads)"
 		-DTPL_ENABLE_QD="$(usex qd)"
-		-DTPL_ENABLE_QT="$(usex qt5)"
 		-DTPL_ENABLE_SCALAPACK="$(usex scalapack)"
 		-DTPL_ENABLE_Scotch="$(usex scotch)"
 		-DTPL_ENABLE_SuperLU="$(usex superlu)"


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2018-04-02 12:45 Justin Lecher
  0 siblings, 0 replies; 26+ messages in thread
From: Justin Lecher @ 2018-04-02 12:45 UTC (permalink / raw
  To: gentoo-commits

commit:     917d8f6ecf968ba641c3a6cbe9b78bddc79f4790
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  2 12:29:35 2018 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Apr  2 12:29:35 2018 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=917d8f6e

sci-libs/trilinos: Change USE=qt to qt5

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

 sci-libs/trilinos/trilinos-12.12.1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/trilinos/trilinos-12.12.1.ebuild b/sci-libs/trilinos/trilinos-12.12.1.ebuild
index 2e8589530..bdf76c3e9 100644
--- a/sci-libs/trilinos/trilinos-12.12.1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.12.1.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 
 IUSE="
 	adolc arprec boost clp cppunit cuda eigen glpk gtest hdf5 hwloc hypre
-	matio metis mkl mumps netcdf petsc qd qt scalapack scotch sparse
+	matio metis mkl mumps netcdf petsc qd qt5 scalapack scotch sparse
 	superlu taucs tbb test threads tvmet yaml zlib X
 "
 
@@ -45,7 +45,7 @@ RDEPEND="
 	netcdf? ( sci-libs/netcdf )
 	petsc? ( sci-mathematics/petsc )
 	qd? ( sci-libs/qd )
-	qt? ( dev-qt/qtgui )
+	qt5? ( dev-qt/qtgui:5= )
 	scalapack? ( virtual/scalapack )
 	scotch? ( sci-libs/scotch )
 	sparse? ( sci-libs/cxsparse sci-libs/umfpack )
@@ -128,7 +128,7 @@ src_configure() {
 		-DTPL_ENABLE_PETSC="$(usex petsc)"
 		-DTPL_ENABLE_Pthread="$(usex threads)"
 		-DTPL_ENABLE_QD="$(usex qd)"
-		-DTPL_ENABLE_QT="$(usex qt)"
+		-DTPL_ENABLE_QT="$(usex qt5)"
 		-DTPL_ENABLE_SCALAPACK="$(usex scalapack)"
 		-DTPL_ENABLE_Scotch="$(usex scotch)"
 		-DTPL_ENABLE_SuperLU="$(usex superlu)"


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2017-07-07 15:52 Matthias Maier
  0 siblings, 0 replies; 26+ messages in thread
From: Matthias Maier @ 2017-07-07 15:52 UTC (permalink / raw
  To: gentoo-commits

commit:     9973930b08f9a840ffae350875e6842fce4832cd
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  7 15:52:06 2017 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Jul  7 15:52:06 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=9973930b

sci-libs/trilinos: bugfix - change eapply_user to epatch_user for EAPI 5

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sci-libs/trilinos/trilinos-12.10.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild b/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild
index a9582b292..f577e1f5d 100644
--- a/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild
@@ -87,7 +87,7 @@ src_prepare() {
 		"${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch \
 		"${FILESDIR}"/${P}-fix_install_paths_for_destdir-2.patch
 
-	eapply_user
+	epatch_user
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2017-07-07 15:49 Matthias Maier
  0 siblings, 0 replies; 26+ messages in thread
From: Matthias Maier @ 2017-07-07 15:49 UTC (permalink / raw
  To: gentoo-commits

commit:     78049a4bca7a74b626571d4972b09b802b1f40bf
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  7 15:49:15 2017 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Jul  7 15:49:15 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=78049a4b

sci-libs/trilinos: add eapply_user to src_prepare

We'll have to migrate to EAPI 6 at some point

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sci-libs/trilinos/trilinos-12.10.1-r1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild b/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild
index 8834315b2..a9582b292 100644
--- a/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild
@@ -86,6 +86,8 @@ 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
+
+	eapply_user
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2017-02-24 18:32 Christoph Junghans
  0 siblings, 0 replies; 26+ messages in thread
From: Christoph Junghans @ 2017-02-24 18:32 UTC (permalink / raw
  To: gentoo-commits

commit:     483b59b915db6a1648b12b29d55ffe30668057ff
Author:     Christoph Junghans <junghans <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 18:32:12 2017 +0000
Commit:     Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 18:32:20 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=483b59b9

sci-libs/trilinos: added X deps

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/trilinos/trilinos-12.10.1.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-libs/trilinos/trilinos-12.10.1.ebuild b/sci-libs/trilinos/trilinos-12.10.1.ebuild
index c00a3ef46..16709a742 100644
--- a/sci-libs/trilinos/trilinos-12.10.1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.10.1.ebuild
@@ -18,7 +18,7 @@ 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
+	superlu taucs tbb test threads tvmet yaml zlib X
 "
 
 # TODO: fix export cmake function for tests
@@ -55,7 +55,8 @@ RDEPEND="
 	tbb? ( dev-cpp/tbb )
 	tvmet? ( dev-libs/tvmet )
 	yaml? ( dev-cpp/yaml-cpp )
-	zlib? ( sys-libs/zlib )"
+	zlib? ( sys-libs/zlib )
+	X? ( x11-libs/libX11 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -144,6 +145,7 @@ src_configure() {
 		$(trilinos_enable tvmet)
 		$(trilinos_enable yaml yaml-cpp)
 		$(trilinos_enable zlib Zlib)
+		$(trilinos_enable X X11)
 	)
 
 	use eigen && \


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2016-08-31  6:56 Marius Brehler
  0 siblings, 0 replies; 26+ messages in thread
From: Marius Brehler @ 2016-08-31  6:56 UTC (permalink / raw
  To: gentoo-commits

commit:     971b1776cb9a0c70e4f0b2937822fcf932ff9046
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 01:11:38 2016 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Tue Aug 30 01:11:38 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=971b1776

sci-libs/trilinos: version bump to 12.6.4

Package-Manager: portage-2.2.28

 sci-libs/trilinos/trilinos-12.6.4.ebuild | 208 +++++++++++++++++++++++++++++++
 1 file changed, 208 insertions(+)

diff --git a/sci-libs/trilinos/trilinos-12.6.4.ebuild b/sci-libs/trilinos/trilinos-12.6.4.ebuild
new file mode 100644
index 0000000..707a6f1
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-12.6.4.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+}


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2016-08-31  6:56 Marius Brehler
  0 siblings, 0 replies; 26+ messages in thread
From: Marius Brehler @ 2016-08-31  6:56 UTC (permalink / raw
  To: gentoo-commits

commit:     7580aba4710340704b902b803c4084d9a7a2a6af
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 01:13:20 2016 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Tue Aug 30 01:13:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=7580aba4

sci-libs/trilinos: add myself to metadata

Package-Manager: portage-2.2.28

 sci-libs/trilinos/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sci-libs/trilinos/metadata.xml b/sci-libs/trilinos/metadata.xml
index a19645b..b430895 100644
--- a/sci-libs/trilinos/metadata.xml
+++ b/sci-libs/trilinos/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>tamiko@gentoo.org</email>
+		<name>Matthias Maier</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>andyspiros@gmail.com</email>
 	</maintainer>
 	<maintainer type="project">


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2016-07-12 19:57 Marius Brehler
  0 siblings, 0 replies; 26+ messages in thread
From: Marius Brehler @ 2016-07-12 19:57 UTC (permalink / raw
  To: gentoo-commits

commit:     f69cc4403115f698e4e0b5f53f1cd5f4c501118b
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  9 12:54:26 2016 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Sat Jul  9 13:01:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=f69cc440

sci-libs/trilinos: remove old versions

Package-Manager: portage-2.2.28

 sci-libs/trilinos/trilinos-11.10.2.ebuild    | 203 --------------------------
 sci-libs/trilinos/trilinos-11.12.1-r1.ebuild | 203 --------------------------
 sci-libs/trilinos/trilinos-12.6.2.ebuild     | 208 ---------------------------
 3 files changed, 614 deletions(-)

diff --git a/sci-libs/trilinos/trilinos-11.10.2.ebuild b/sci-libs/trilinos/trilinos-11.10.2.ebuild
deleted file mode 100644
index f8cb050..0000000
--- a/sci-libs/trilinos/trilinos-11.10.2.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 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 )
-	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.4.2-fix-install-paths.patch
-}
-
-src_configure() {
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"
-		-DTrilinos_ENABLE_ALL_PACKAGES=ON
-		-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 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-11.12.1-r1.ebuild b/sci-libs/trilinos/trilinos-11.12.1-r1.ebuild
deleted file mode 100644
index 868045b..0000000
--- a/sci-libs/trilinos/trilinos-11.12.1-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 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 )
-	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}"/${P}-fix-install-paths.patch
-}
-
-src_configure() {
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"
-		-DTrilinos_ENABLE_ALL_PACKAGES=ON
-		-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 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.2.ebuild b/sci-libs/trilinos/trilinos-12.6.2.ebuild
deleted file mode 100644
index 707a6f1..0000000
--- a/sci-libs/trilinos/trilinos-12.6.2.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
-}


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2016-07-12 19:57 Marius Brehler
  0 siblings, 0 replies; 26+ messages in thread
From: Marius Brehler @ 2016-07-12 19:57 UTC (permalink / raw
  To: gentoo-commits

commit:     92ab1d46cfbb4b93e40fcb0fce5a8e28bab84f07
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  9 12:38:39 2016 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Sat Jul  9 12:38:39 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=92ab1d46

sci-libs/trilinos: Add missing dependency, bug #579320

Package-Manager: portage-2.2.28

 sci-libs/trilinos/trilinos-11.10.2.ebuild    | 3 ++-
 sci-libs/trilinos/trilinos-11.12.1-r1.ebuild | 3 ++-
 sci-libs/trilinos/trilinos-11.14.1-r1.ebuild | 3 ++-
 sci-libs/trilinos/trilinos-12.0.1.ebuild     | 3 ++-
 sci-libs/trilinos/trilinos-12.2.1.ebuild     | 3 ++-
 sci-libs/trilinos/trilinos-12.6.2.ebuild     | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sci-libs/trilinos/trilinos-11.10.2.ebuild b/sci-libs/trilinos/trilinos-11.10.2.ebuild
index ac3a99e..f8cb050 100644
--- a/sci-libs/trilinos/trilinos-11.10.2.ebuild
+++ b/sci-libs/trilinos/trilinos-11.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,6 +26,7 @@ IUSE="
 RESTRICT="test"
 
 RDEPEND="
+	sys-libs/binutils-libs
 	virtual/blas
 	virtual/lapack
 	virtual/mpi

diff --git a/sci-libs/trilinos/trilinos-11.12.1-r1.ebuild b/sci-libs/trilinos/trilinos-11.12.1-r1.ebuild
index 9d55c34..868045b 100644
--- a/sci-libs/trilinos/trilinos-11.12.1-r1.ebuild
+++ b/sci-libs/trilinos/trilinos-11.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,6 +26,7 @@ IUSE="
 RESTRICT="test"
 
 RDEPEND="
+	sys-libs/binutils-libs
 	virtual/blas
 	virtual/lapack
 	virtual/mpi

diff --git a/sci-libs/trilinos/trilinos-11.14.1-r1.ebuild b/sci-libs/trilinos/trilinos-11.14.1-r1.ebuild
index 48adf20..2f32029 100644
--- a/sci-libs/trilinos/trilinos-11.14.1-r1.ebuild
+++ b/sci-libs/trilinos/trilinos-11.14.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,6 +25,7 @@ IUSE="
 RESTRICT="test"
 
 RDEPEND="
+	sys-libs/binutils-libs
 	virtual/blas
 	virtual/lapack
 	virtual/mpi

diff --git a/sci-libs/trilinos/trilinos-12.0.1.ebuild b/sci-libs/trilinos/trilinos-12.0.1.ebuild
index 2278603..a511a3d 100644
--- a/sci-libs/trilinos/trilinos-12.0.1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,6 +25,7 @@ IUSE="
 RESTRICT="test"
 
 RDEPEND="
+	sys-libs/binutils-libs
 	virtual/blas
 	virtual/lapack
 	virtual/mpi

diff --git a/sci-libs/trilinos/trilinos-12.2.1.ebuild b/sci-libs/trilinos/trilinos-12.2.1.ebuild
index 5862e73..a73261d 100644
--- a/sci-libs/trilinos/trilinos-12.2.1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,6 +25,7 @@ IUSE="
 RESTRICT="test"
 
 RDEPEND="
+	sys-libs/binutils-libs
 	virtual/blas
 	virtual/lapack
 	virtual/mpi

diff --git a/sci-libs/trilinos/trilinos-12.6.2.ebuild b/sci-libs/trilinos/trilinos-12.6.2.ebuild
index dca587c..707a6f1 100644
--- a/sci-libs/trilinos/trilinos-12.6.2.ebuild
+++ b/sci-libs/trilinos/trilinos-12.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,6 +25,7 @@ IUSE="
 RESTRICT="test"
 
 RDEPEND="
+	sys-libs/binutils-libs
 	virtual/blas
 	virtual/lapack
 	virtual/mpi


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2016-07-12 19:57 Marius Brehler
  0 siblings, 0 replies; 26+ messages in thread
From: Marius Brehler @ 2016-07-12 19:57 UTC (permalink / raw
  To: gentoo-commits

commit:     b9815b6d26603b8d8f93f052e644a4748b358743
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  9 12:40:36 2016 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Sat Jul  9 13:01:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=b9815b6d

sci-libs/trilinos: version bump to 12.6.3

Package-Manager: portage-2.2.28

 sci-libs/trilinos/trilinos-12.6.3.ebuild | 208 +++++++++++++++++++++++++++++++
 1 file changed, 208 insertions(+)

diff --git a/sci-libs/trilinos/trilinos-12.6.3.ebuild b/sci-libs/trilinos/trilinos-12.6.3.ebuild
new file mode 100644
index 0000000..707a6f1
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-12.6.3.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+}


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2016-03-06 21:40 Justin Lecher
  0 siblings, 0 replies; 26+ messages in thread
From: Justin Lecher @ 2016-03-06 21:40 UTC (permalink / raw
  To: gentoo-commits

commit:     f16008a313dc5ea812d15ef50be794670e1d1df6
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  6 21:40:15 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar  6 21:40:15 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=f16008a3

Remaining broken tag

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/trilinos/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/trilinos/metadata.xml b/sci-libs/trilinos/metadata.xml
index bf91c9a..a19645b 100644
--- a/sci-libs/trilinos/metadata.xml
+++ b/sci-libs/trilinos/metadata.xml
@@ -18,7 +18,7 @@
 		<flag name="arprec">Add support for arprec (<pkg>sci-libs/arprec</pkg>)</flag>
 		<flag name="boost">Add support for boost (<pkg>dev-libs/boost</pkg>)</flag>
 		<flag name="clp">Add support for clp (<pkg>sci-libs/coinor-clp</pkg>)</flag>
-		<flag name="cppunit">Add support for (<pkg/>)</flag>
+		<flag name="cppunit">Add support for (...)</flag>
 		<flag name="cuda">Add support for cuda (<pkg>dev-util/nvidia-cuda-toolkit</pkg>)</flag>
 		<flag name="eigen">Add support for eigen (<pkg>dev-cpp/eigen</pkg>)</flag>
 		<flag name="glpk">Add support for (...)</flag>


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2016-03-06 21:32 Justin Lecher
  0 siblings, 0 replies; 26+ messages in thread
From: Justin Lecher @ 2016-03-06 21:32 UTC (permalink / raw
  To: gentoo-commits

commit:     460aa06a616c8e34143e136d1713a278b379e5c6
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  6 21:32:07 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar  6 21:32:07 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=460aa06a

Fix the last broken matadata.xml

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/trilinos/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/trilinos/metadata.xml b/sci-libs/trilinos/metadata.xml
index 93012b9..bf91c9a 100644
--- a/sci-libs/trilinos/metadata.xml
+++ b/sci-libs/trilinos/metadata.xml
@@ -21,7 +21,7 @@
 		<flag name="cppunit">Add support for (<pkg/>)</flag>
 		<flag name="cuda">Add support for cuda (<pkg>dev-util/nvidia-cuda-toolkit</pkg>)</flag>
 		<flag name="eigen">Add support for eigen (<pkg>dev-cpp/eigen</pkg>)</flag>
-		<flag name="glpk">Add support for (<pkg/>)</flag>
+		<flag name="glpk">Add support for (...)</flag>
 		<flag name="gtest">Add support for gtest (<pkg>dev-cpp/gtest</pkg>)</flag>
 		<flag name="hwloc">Add support for hwloc (<pkg>sys-apps/hwloc</pkg>)</flag>
 		<flag name="hdf5">Add support for hdf5 (<pkg>sci-libs/hdf5</pkg>)</flag>


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2015-09-21 19:44 Justin Lecher
  0 siblings, 0 replies; 26+ messages in thread
From: Justin Lecher @ 2015-09-21 19:44 UTC (permalink / raw
  To: gentoo-commits

commit:     0501f1ab64f9d422f6cf807abd500986d39edbd3
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 19:31:32 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 19:31:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=0501f1ab

sci-libs/trilinos: Drop local USE

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/trilinos/metadata.xml | 61 +++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/sci-libs/trilinos/metadata.xml b/sci-libs/trilinos/metadata.xml
index e1bfe00..76fe49d 100644
--- a/sci-libs/trilinos/metadata.xml
+++ b/sci-libs/trilinos/metadata.xml
@@ -5,39 +5,38 @@
 	<maintainer>
 		<email>andyspiros@gmail.com</email>
 	</maintainer>
-<longdescription lang="en">
+	<longdescription lang="en">
 	The Trilinos Project is an effort to develop algorithms and enabling
 	technologies within an object-oriented software framework for the solution
 	of large-scale, complex multi-physics engineering and scientific problems.
 </longdescription>
-<use>
-	<flag name="adolc">Add support for adolc (<pkg>sci-libs/adolc</pkg>)</flag>
-	<flag name="arprec">Add support for arprec (<pkg>sci-libs/arprec</pkg>)</flag>
-	<flag name="boost">Add support for boost (<pkg>dev-libs/boost</pkg>)</flag>
-	<flag name="clp">Add support for clp (<pkg>sci-libs/coinor-clp</pkg>)</flag>
-	<flag name="cppunit">Add support for (<pkg></pkg>)</flag>
-	<flag name="cuda">Add support for cuda (<pkg>dev-util/nvidia-cuda-toolkit</pkg>)</flag>
-	<flag name="eigen">Add support for eigen (<pkg>dev-cpp/eigen</pkg>)</flag>
-	<flag name="glpk">Add support for (<pkg></pkg>)</flag>
-	<flag name="gtest">Add support for gtest (<pkg>dev-cpp/gtest</pkg>)</flag>
-	<flag name="hwloc">Add support for hwloc (<pkg>sys-apps/hwloc</pkg>)</flag>
-	<flag name="hdf5">Add support for hdf5 (<pkg>sci-libs/hdf5</pkg>)</flag>
-	<flag name="hypre">Add support for hypre (<pkg>sci-libs/hypre</pkg>)</flag>
-	<flag name="matio">Add support for matio (<pkg>sci-libs/matio</pkg>)</flag>
-	<flag name="metis">Add support for metis (<pkg>sci-libs/(par)metis</pkg>)</flag>
-	<flag name="mkl">Add support for mkl (<pkg>sci/libs/mkl</pkg>)</flag>
-	<flag name="mumps">Add support for mumps (<pkg>sci-libs/mumps</pkg>)</flag>
-	<flag name="netcdf">Add support for netcdf (<pkg>sci-libs/netcdf</pkg>)</flag>
-	<flag name="petsc">Add support for petsc (<pkg>sci-mathematics/petsc</pkg>)</flag>
-	<flag name="qd">Add support for qd (<pkg>sci-libs/qd</pkg>)</flag>
-	<flag name="scalapack">Add support for scalapack (<pkg>virtual/scalapack</pkg>)</flag>
-	<flag name="scotch">Add support for scotch (<pkg>sci-libs/scotch</pkg>)</flag>
-	<flag name="sparse">Add support for sparse matrix solvers (<pkg>sci-libs/umfpack</pkg>)</flag>
-	<flag name="superlu">Add support for superlu (<pkg>sci-libs/superlu</pkg>)</flag>
-	<flag name="taucs">Add support for taucs (<pkg>sci-libs/taucs</pkg>)</flag>
-	<flag name="tbb">Add support for threading building blocks library (<pkg>dev-cpp/tbb</pkg>)</flag>
-	<flag name="tvmet">Add support for tvmet (<pkg>dev-libs/tvmet</pkg>)</flag>
-	<flag name="umfpack">Add support for umfpack (<pkg>sci-libs/umfpack</pkg>)</flag>
-	<flag name="yaml">Add support for yaml (<pkg>dev-cpp-yaml</pkg>)</flag>
-</use>
+	<use>
+		<flag name="adolc">Add support for adolc (<pkg>sci-libs/adolc</pkg>)</flag>
+		<flag name="arprec">Add support for arprec (<pkg>sci-libs/arprec</pkg>)</flag>
+		<flag name="boost">Add support for boost (<pkg>dev-libs/boost</pkg>)</flag>
+		<flag name="clp">Add support for clp (<pkg>sci-libs/coinor-clp</pkg>)</flag>
+		<flag name="cppunit">Add support for (<pkg/>)</flag>
+		<flag name="cuda">Add support for cuda (<pkg>dev-util/nvidia-cuda-toolkit</pkg>)</flag>
+		<flag name="eigen">Add support for eigen (<pkg>dev-cpp/eigen</pkg>)</flag>
+		<flag name="glpk">Add support for (<pkg/>)</flag>
+		<flag name="gtest">Add support for gtest (<pkg>dev-cpp/gtest</pkg>)</flag>
+		<flag name="hwloc">Add support for hwloc (<pkg>sys-apps/hwloc</pkg>)</flag>
+		<flag name="hdf5">Add support for hdf5 (<pkg>sci-libs/hdf5</pkg>)</flag>
+		<flag name="hypre">Add support for hypre (<pkg>sci-libs/hypre</pkg>)</flag>
+		<flag name="matio">Add support for matio (<pkg>sci-libs/matio</pkg>)</flag>
+		<flag name="metis">Add support for metis (<pkg>sci-libs/(par)metis</pkg>)</flag>
+		<flag name="mkl">Add support for mkl (<pkg>sci/libs/mkl</pkg>)</flag>
+		<flag name="mumps">Add support for mumps (<pkg>sci-libs/mumps</pkg>)</flag>
+		<flag name="netcdf">Add support for netcdf (<pkg>sci-libs/netcdf</pkg>)</flag>
+		<flag name="petsc">Add support for petsc (<pkg>sci-mathematics/petsc</pkg>)</flag>
+		<flag name="qd">Add support for qd (<pkg>sci-libs/qd</pkg>)</flag>
+		<flag name="scalapack">Add support for scalapack (<pkg>virtual/scalapack</pkg>)</flag>
+		<flag name="scotch">Add support for scotch (<pkg>sci-libs/scotch</pkg>)</flag>
+		<flag name="sparse">Add support for sparse matrix solvers (<pkg>sci-libs/umfpack</pkg>)</flag>
+		<flag name="superlu">Add support for superlu (<pkg>sci-libs/superlu</pkg>)</flag>
+		<flag name="taucs">Add support for taucs (<pkg>sci-libs/taucs</pkg>)</flag>
+		<flag name="tbb">Add support for threading building blocks library (<pkg>dev-cpp/tbb</pkg>)</flag>
+		<flag name="tvmet">Add support for tvmet (<pkg>dev-libs/tvmet</pkg>)</flag>
+		<flag name="yaml">Add support for yaml (<pkg>dev-cpp-yaml</pkg>)</flag>
+	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2015-08-27 15:01 Justin Lecher
  0 siblings, 0 replies; 26+ messages in thread
From: Justin Lecher @ 2015-08-27 15:01 UTC (permalink / raw
  To: gentoo-commits

commit:     f6fbd9557fb7924a23114b09c528395e2fe94386
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 05:50:46 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 05:50:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=f6fbd955

sci-libs/trilinos: version bump to 12.2.1

Package-Manager: portage-2.2.20.1

 sci-libs/trilinos/ChangeLog              |   5 +
 sci-libs/trilinos/trilinos-12.2.1.ebuild | 207 +++++++++++++++++++++++++++++++
 2 files changed, 212 insertions(+)

diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index f2be69f..4957c5c 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*trilinos-12.2.1 (27 Aug 2015)
+
+  27 Aug 2015; Matthias Maier <tamiko@gentoo.org> +trilinos-12.2.1.ebuild:
+  sci-libs/trilinos: version bump to 12.2.1
+
 *trilinos-12.0.1 (13 Jul 2015)
 
   13 Jul 2015; Matthias Maier <tamiko@gentoo.org>

diff --git a/sci-libs/trilinos/trilinos-12.2.1.ebuild b/sci-libs/trilinos/trilinos-12.2.1.ebuild
new file mode 100644
index 0000000..b090b96
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-12.2.1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="
+	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}"/${PN}-12.0.1-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
+}


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2014-10-24  3:33 Christoph Junghans
  0 siblings, 0 replies; 26+ messages in thread
From: Christoph Junghans @ 2014-10-24  3:33 UTC (permalink / raw
  To: gentoo-commits

commit:     31a0214fac869f748861e9b505c25490bf5f47c4
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 21 22:33:32 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Oct 21 22:33:32 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=31a0214f

version bump

Package-Manager: portage-2.2.8-r2

---
 sci-libs/trilinos/ChangeLog                                         | 6 ++++++
 .../trilinos/{trilinos-11.4.2.ebuild => trilinos-11.10.2.ebuild}    | 4 ++--
 sci-libs/trilinos/trilinos-11.4.2.ebuild                            | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index 394f9fb..d6c571d 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*trilinos-11.10.2 (21 Oct 2014)
+
+  21 Oct 2014; Matthias Maier <tamiko@gentoo.org> +trilinos-11.10.2.ebuild,
+  trilinos-11.4.2.ebuild:
+  version bump
+
   06 Jan 2014; Justin Lecher <jlec@gentoo.org> trilinos-11.0.3.ebuild:
   Don't use plain pkg-config
 

diff --git a/sci-libs/trilinos/trilinos-11.4.2.ebuild b/sci-libs/trilinos/trilinos-11.10.2.ebuild
similarity index 98%
copy from sci-libs/trilinos/trilinos-11.4.2.ebuild
copy to sci-libs/trilinos/trilinos-11.10.2.ebuild
index dcd7983..39f3a44 100644
--- a/sci-libs/trilinos/trilinos-11.4.2.ebuild
+++ b/sci-libs/trilinos/trilinos-11.10.2.ebuild
@@ -23,7 +23,7 @@ IUSE="
 "
 
 # TODO: fix export cmake function for tests
-RESTRICT="test"
+RESTRICT="test fetch"
 
 RDEPEND="
 	virtual/blas
@@ -82,7 +82,7 @@ trilinos_enable() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-install-paths.patch
+	epatch "${FILESDIR}"/${PN}-11.4.2-fix-install-paths.patch
 }
 
 src_configure() {

diff --git a/sci-libs/trilinos/trilinos-11.4.2.ebuild b/sci-libs/trilinos/trilinos-11.4.2.ebuild
index dcd7983..51734a4 100644
--- a/sci-libs/trilinos/trilinos-11.4.2.ebuild
+++ b/sci-libs/trilinos/trilinos-11.4.2.ebuild
@@ -23,7 +23,7 @@ IUSE="
 "
 
 # TODO: fix export cmake function for tests
-RESTRICT="test"
+RESTRICT="test fetch"
 
 RDEPEND="
 	virtual/blas


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2014-01-06 19:27 Justin Lecher
  0 siblings, 0 replies; 26+ messages in thread
From: Justin Lecher @ 2014-01-06 19:27 UTC (permalink / raw
  To: gentoo-commits

commit:     90d511bdd10f7bd823c85e4f64052941778c6f04
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 19:26:20 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 19:26:20 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=90d511bd

sci-libs/trilinos: Don't use plain pkg-config

Package-Manager: portage-2.2.8

---
 sci-libs/trilinos/ChangeLog              |  3 +++
 sci-libs/trilinos/trilinos-11.0.3.ebuild | 11 ++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index 9ef8e1d..394f9fb 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> trilinos-11.0.3.ebuild:
+  Don't use plain pkg-config
+
   06 Jan 2014; Justin Lecher <jlec@gentoo.org> trilinos-11.4.2.ebuild,
   metadata.xml:
   Fix moced dep

diff --git a/sci-libs/trilinos/trilinos-11.0.3.ebuild b/sci-libs/trilinos/trilinos-11.0.3.ebuild
index 7ef814c..e50a2e1 100644
--- a/sci-libs/trilinos/trilinos-11.0.3.ebuild
+++ b/sci-libs/trilinos/trilinos-11.0.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 
-inherit cmake-utils
+inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="Scientific library collection for large scale problems"
 HOMEPAGE="http://trilinos.sandia.gov/"
@@ -35,7 +35,8 @@ RDEPEND="
 	taucs? ( sci-libs/taucs )
 	tbb? ( dev-cpp/tbb )
 	umfpack? ( sci-libs/umfpack )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 S="${WORKDIR}/${P}-Source"
 
@@ -48,7 +49,7 @@ pkg_nofetch() {
 
 function trilinos_alternatives {
 	alt_dirs=""
-	for d in $(pkg-config --libs-only-L $1); do
+	for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
 		alt_dirs="${alt_dirs};${d:2}"
 	done
 	arg="-D${2}_LIBRARY_DIRS=${alt_dirs:1}"
@@ -57,7 +58,7 @@ function trilinos_alternatives {
 	)
 
 	alt_libs=""
-	for d in $(pkg-config --libs-only-l $1); do
+	for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
 		alt_libs="${alt_libs};${d:2}"
 	done
 	arg="-D${2}_LIBRARY_NAMES=${alt_libs:1}"


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2014-01-06 18:33 Justin Lecher
  0 siblings, 0 replies; 26+ messages in thread
From: Justin Lecher @ 2014-01-06 18:33 UTC (permalink / raw
  To: gentoo-commits

commit:     c14e7a2482498f45331dcf7adc1fede464625e2c
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 18:30:04 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 18:30:04 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c14e7a24

sci-libs/trilinos: Fix moced dep

Package-Manager: portage-2.2.8

---
 sci-libs/trilinos/ChangeLog              |  6 ++-
 sci-libs/trilinos/metadata.xml           | 64 ++++++++++++++++----------------
 sci-libs/trilinos/trilinos-11.4.2.ebuild |  4 +-
 3 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index 7f1ee3d..9ef8e1d 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/trilinos
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> trilinos-11.4.2.ebuild,
+  metadata.xml:
+  Fix moced dep
+
 *trilinos-11.2.3 (19 Jun 2013)
 
   19 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> +trilinos-11.2.3.ebuild,

diff --git a/sci-libs/trilinos/metadata.xml b/sci-libs/trilinos/metadata.xml
index 46351c5..7d6e9e9 100644
--- a/sci-libs/trilinos/metadata.xml
+++ b/sci-libs/trilinos/metadata.xml
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>andyspiros@gmail.com</email>
-</maintainer>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <maintainer>
+    <email>andyspiros@gmail.com</email>
+  </maintainer>
+  <longdescription lang="en">
   The Trilinos Project is an effort to develop algorithms and enabling
   technologies within an object-oriented software framework for the solution 
   of large-scale, complex multi-physics engineering and scientific problems.
 </longdescription>
-<use>
-  <flag name="adolc">Undocumented USE</flag>
-  <flag name="arprec">Undocumented USE</flag>
-  <flag name="boost">Undocumented USE</flag>
-  <flag name="clp">Undocumented USE</flag>
-  <flag name="cppunit">Undocumented USE</flag>
-  <flag name="cuda">Undocumented USE</flag>
-  <flag name="eigen">Undocumented USE</flag>
-  <flag name="glpk">Undocumented USE</flag>
-  <flag name="gtest">Undocumented USE</flag>
-  <flag name="hwloc">Undocumented USE</flag>
-  <flag name="hypre">Undocumented USE</flag>
-  <flag name="metis">Undocumented USE</flag>
-  <flag name="mkl">Undocumented USE</flag>
-  <flag name="mumps">Undocumented USE</flag>
-  <flag name="petsc">Undocumented USE</flag>
-  <flag name="qd">Undocumented USE</flag>
-  <flag name="scalapack">Undocumented USE</flag>
-  <flag name="scotch">Undocumented USE</flag>
-  <flag name="sparse">Undocumented USE</flag>
-  <flag name="superlu">Undocumented USE</flag>
-  <flag name="taucs">Undocumented USE</flag>
-  <flag name="tbb">Undocumented USE</flag>
-  <flag name="tvmet">Undocumented USE</flag>
-  <flag name="umfpack">Undocumented USE</flag>
-  <flag name="yaml">Undocumented USE</flag>
-</use>
+  <use>
+    <flag name="adolc">Undocumented USE</flag>
+    <flag name="arprec">Undocumented USE</flag>
+    <flag name="boost">Undocumented USE</flag>
+    <flag name="clp">Undocumented USE</flag>
+    <flag name="cppunit">Undocumented USE</flag>
+    <flag name="cuda">Undocumented USE</flag>
+    <flag name="eigen">Undocumented USE</flag>
+    <flag name="glpk">Undocumented USE</flag>
+    <flag name="gtest">Undocumented USE</flag>
+    <flag name="hwloc">Undocumented USE</flag>
+    <flag name="hypre">Undocumented USE</flag>
+    <flag name="metis">Undocumented USE</flag>
+    <flag name="mkl">Undocumented USE</flag>
+    <flag name="mumps">Undocumented USE</flag>
+    <flag name="petsc">Undocumented USE</flag>
+    <flag name="qd">Undocumented USE</flag>
+    <flag name="scalapack">Undocumented USE</flag>
+    <flag name="scotch">Undocumented USE</flag>
+    <flag name="sparse">Undocumented USE</flag>
+    <flag name="superlu">Undocumented USE</flag>
+    <flag name="taucs">Undocumented USE</flag>
+    <flag name="tbb">Undocumented USE</flag>
+    <flag name="tvmet">Undocumented USE</flag>
+    <flag name="umfpack">Undocumented USE</flag>
+    <flag name="yaml">Undocumented USE</flag>
+  </use>
 </pkgmetadata>

diff --git a/sci-libs/trilinos/trilinos-11.4.2.ebuild b/sci-libs/trilinos/trilinos-11.4.2.ebuild
index b9375e3..dcd7983 100644
--- a/sci-libs/trilinos/trilinos-11.4.2.ebuild
+++ b/sci-libs/trilinos/trilinos-11.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -43,7 +43,7 @@ RDEPEND="
 	metis? ( || ( sci-libs/parmetis sci-libs/metis ) )
 	mumps? ( sci-libs/mumps )
 	netcdf? ( sci-libs/netcdf )
-	petsc? ( sci-libs/petsc )
+	petsc? ( sci-mathematics/petsc )
 	qd? ( sci-libs/qd )
 	qt4? ( dev-qt/qtgui:4 )
 	scalapack? ( virtual/scalapack )


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2013-11-12 16:43 Nicolas Bock
  0 siblings, 0 replies; 26+ messages in thread
From: Nicolas Bock @ 2013-11-12 16:43 UTC (permalink / raw
  To: gentoo-commits

commit:     be0952eff5cd64513a7de3ef5ebdde61aeeb28bf
Author:     Matthias Maier <matthias.maier <AT> iwr <DOT> uni-heidelberg <DOT> de>
AuthorDate: Tue Nov 12 10:48:22 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Tue Nov 12 10:48:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=be0952ef

sci-libs/trilinos: Bugfixes:

Add forgotten manifest statement for trilinos-11.4.2

Also provide a env.d/99trilinos file that registers $(get_libdir)/trilinos
into LDPATH so that the library locations are actually known by the dynamic
linker.

---
 sci-libs/trilinos/trilinos-11.4.2.ebuild | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/sci-libs/trilinos/trilinos-11.4.2.ebuild b/sci-libs/trilinos/trilinos-11.4.2.ebuild
index 9fcddac..b9375e3 100644
--- a/sci-libs/trilinos/trilinos-11.4.2.ebuild
+++ b/sci-libs/trilinos/trilinos-11.4.2.ebuild
@@ -189,3 +189,14 @@ src_configure() {
 	# 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
+}


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2013-06-19 23:51 Sebastien Fabbro
  0 siblings, 0 replies; 26+ messages in thread
From: Sebastien Fabbro @ 2013-06-19 23:51 UTC (permalink / raw
  To: gentoo-commits

commit:     ea1ef1945fdd1b8028f8c31f14ee598496e1ae91
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 19 23:51:23 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Jun 19 23:51:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ea1ef194

sci-libs/trilinos: Version bump and rewrite

Package-Manager: portage-2.2.01.22013-prefix
RepoMan-Options: --force

---
 sci-libs/trilinos/ChangeLog              |   7 +-
 sci-libs/trilinos/metadata.xml           |  16 +++
 sci-libs/trilinos/trilinos-11.2.3.ebuild | 186 +++++++++++++++++++++++++++++++
 3 files changed, 208 insertions(+), 1 deletion(-)

diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index c05bfeb..7f1ee3d 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*trilinos-11.2.3 (19 Jun 2013)
+
+  19 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> +trilinos-11.2.3.ebuild,
+  metadata.xml:
+  sci-libs/trilinos: Version bump and rewrite
+
   12 Jun 2013; Justin Lecher <jlec@gentoo.org> -trilinos-10.10.1.ebuild,
   trilinos-11.0.3.ebuild:
   Drop old, fix handling of qt support
@@ -25,4 +31,3 @@
   8 Apr 2012; Andrea Arteaga <andyspiros@gmail.com>
   +trilinos-10.10.1.ebuild +metadata.xml:
   Initial ebuild.
-

diff --git a/sci-libs/trilinos/metadata.xml b/sci-libs/trilinos/metadata.xml
index fbde4bf..46351c5 100644
--- a/sci-libs/trilinos/metadata.xml
+++ b/sci-libs/trilinos/metadata.xml
@@ -11,14 +11,30 @@
   of large-scale, complex multi-physics engineering and scientific problems.
 </longdescription>
 <use>
+  <flag name="adolc">Undocumented USE</flag>
   <flag name="arprec">Undocumented USE</flag>
   <flag name="boost">Undocumented USE</flag>
+  <flag name="clp">Undocumented USE</flag>
+  <flag name="cppunit">Undocumented USE</flag>
   <flag name="cuda">Undocumented USE</flag>
+  <flag name="eigen">Undocumented USE</flag>
+  <flag name="glpk">Undocumented USE</flag>
+  <flag name="gtest">Undocumented USE</flag>
   <flag name="hwloc">Undocumented USE</flag>
+  <flag name="hypre">Undocumented USE</flag>
+  <flag name="metis">Undocumented USE</flag>
+  <flag name="mkl">Undocumented USE</flag>
+  <flag name="mumps">Undocumented USE</flag>
+  <flag name="petsc">Undocumented USE</flag>
   <flag name="qd">Undocumented USE</flag>
+  <flag name="scalapack">Undocumented USE</flag>
   <flag name="scotch">Undocumented USE</flag>
+  <flag name="sparse">Undocumented USE</flag>
+  <flag name="superlu">Undocumented USE</flag>
   <flag name="taucs">Undocumented USE</flag>
   <flag name="tbb">Undocumented USE</flag>
+  <flag name="tvmet">Undocumented USE</flag>
   <flag name="umfpack">Undocumented USE</flag>
+  <flag name="yaml">Undocumented USE</flag>
 </use>
 </pkgmetadata>

diff --git a/sci-libs/trilinos/trilinos-11.2.3.ebuild b/sci-libs/trilinos/trilinos-11.2.3.ebuild
new file mode 100644
index 0000000..b22fa58
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-11.2.3.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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="${P}-Source.tar.bz2"
+
+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 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="
+	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 )
+	mkl? ( sci-libs/mkl )
+	metis? ( || ( sci-libs/parmetis sci-libs/metis ) )
+	mumps? ( sci-libs/mumps )
+	netcdf? ( sci-libs/netcdf )
+	petsc? ( sci-libs/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_configure() {
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"
+		-DTrilinos_ENABLE_ALL_PACKAGES=ON
+		-DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
+		-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
+		-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 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 ?
+}


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2013-06-12 20:04 Justin Lecher
  0 siblings, 0 replies; 26+ messages in thread
From: Justin Lecher @ 2013-06-12 20:04 UTC (permalink / raw
  To: gentoo-commits

commit:     59bb9b487b28a8c629187a993a06454b0b68e8dc
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 20:00:52 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 20:00:52 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=59bb9b48

sci-libs/trilinos: Drop old, fix handling of qt support

Package-Manager: portage-2.2.0_alpha179

---
 sci-libs/trilinos/ChangeLog               |   4 +
 sci-libs/trilinos/trilinos-10.10.1.ebuild | 124 ------------------------------
 sci-libs/trilinos/trilinos-11.0.3.ebuild  |  12 +--
 3 files changed, 11 insertions(+), 129 deletions(-)

diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index 6c5b81b..c05bfeb 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Jun 2013; Justin Lecher <jlec@gentoo.org> -trilinos-10.10.1.ebuild,
+  trilinos-11.0.3.ebuild:
+  Drop old, fix handling of qt support
+
   03 Apr 2013; Matthias Maier <tamiko@kyomu.43-1.org> trilinos-11.0.3.ebuild:
   Version bump; correct install paths; fix prefix support
 

diff --git a/sci-libs/trilinos/trilinos-10.10.1.ebuild b/sci-libs/trilinos/trilinos-10.10.1.ebuild
deleted file mode 100644
index e9e9300..0000000
--- a/sci-libs/trilinos/trilinos-10.10.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Scientific library collection for large scale problems"
-HOMEPAGE="http://trilinos.sandia.gov/"
-SRC_URI="${P}-Source.tar.gz"
-SRC_PAGE="10.10"
-
-SLOT="0"
-LICENSE="BSD LGPL-2.1"
-IUSE="arprec boost cuda hdf5 hwloc netcdf qd qt4 scotch taucs tbb umfpack zlib"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	virtual/blas
-	virtual/lapack
-	virtual/mpi
-	>=sci-libs/scalapack-2
-	arprec? ( sci-libs/arprec )
-	boost? ( dev-libs/boost )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
-	hdf5? ( sci-libs/hdf5[mpi] )
-	hwloc? ( sys-apps/hwloc )
-	netcdf? ( sci-libs/netcdf )
-	qd? ( sci-libs/qd )
-	qt4? ( >=dev-qt/qtgui-4.5 )
-	scotch? ( sys-libs/scotch[mpi] )
-	taucs? ( sci-libs/taucs )
-	tbb? ( dev-cpp/tbb )
-	umfpack? ( sci-libs/umfpack )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${P}-Source"
-
-RESTRICT="fetch"
-
-pkg_nofetch() {
-	einfo "Sandia requires that you register to the site in order to download Trilinos."
-	einfo "Please download ${SRC_URI} from:"
-	einfo "http://trilinos.sandia.gov/download/trilinos-${SRC_PAGE}.html"
-	einfo "and move it to ${DISTDIR}"
-}
-
-function trilinos_alternatives {
-	alt_dirs=""
-	for d in $(pkg-config --libs-only-L $1); do
-		alt_dirs="${alt_dirs};${d:2}"
-	done
-	arg="-D${2}_LIBRARY_DIRS=${alt_dirs:1}"
-	mycmakeargs+=(
-		$arg
-	)
-
-	alt_libs=""
-	for d in $(pkg-config --libs-only-l $1); do
-		alt_libs="${alt_libs};${d:2}"
-	done
-	arg="-D${2}_LIBRARY_NAMES=${alt_libs:1}"
-	mycmakeargs+=(
-		$arg
-	)
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE="release"
-	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)
-
-		# Mandatory dependencies
-		-DTPL_ENABLE_BinUtils=ON
-		-DTPL_ENABLE_MPI=ON
-		-DTPL_ENABLE_BLAS=ON
-		-DTPL_ENABLE_LAPACK=ON
-		-DTPL_ENABLE_BLACS=ON
-		-DTPL_ENABLE_SCALAPACK=ON
-		-DTrilinos_EXTRA_LINK_FLAGS="-lmpi -lmpi_cxx"
-
-		# Optional dependencies
-		$(cmake-utils_use arprec TPL_ENABLE_ARPREC)
-		$(cmake-utils_use boost TPL_ENABLE_Boost)
-		$(cmake-utils_use boost TPL_ENABLE_BoostLib)
-		$(cmake-utils_use cuda TPL_ENABLE_CUDA)
-		$(cmake-utils_use hdf5 TPL_ENABLE_HDF5)
-		$(cmake-utils_use hwloc TPL_ENABLE_HWLOC)
-		$(cmake-utils_use netcdf TPL_ENABLE_Netcdf)
-		$(cmake-utils_use qd TPL_ENABLE_QD)
-		$(cmake-utils_use qt TPL_ENABLE_QT)
-		$(cmake-utils_use scotch TPL_ENABLE_Scotch)
-		$(cmake-utils_use taucs TPL_ENABLE_TAUCS)
-		$(cmake-utils_use tbb TPL_ENABLE_TBB)
-		$(cmake-utils_use umfpack TPL_ENABLE_UMFPACK)
-		$(cmake-utils_use zlib TPL_ENABLE_Zlib)
-	)
-
-	# Scotch libraries
-	if use scotch; then
-		mycmakeargs+=( -DScotch_INCLUDE_DIRS="/usr/include/scotch" )
-	fi
-
-	# Add BLAS libraries
-	trilinos_alternatives blas BLAS
-	trilinos_alternatives lapack LAPACK
-	trilinos_alternatives scalapack SCALAPACK
-	trilinos_alternatives scalapack BLACS
-
-	mycmakeargs+=( -DBLACS_INCLUDE_DIRS="/usr/include/blacs" )
-
-	cmake-utils_src_configure
-}

diff --git a/sci-libs/trilinos/trilinos-11.0.3.ebuild b/sci-libs/trilinos/trilinos-11.0.3.ebuild
index 209b148..7ef814c 100644
--- a/sci-libs/trilinos/trilinos-11.0.3.ebuild
+++ b/sci-libs/trilinos/trilinos-11.0.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
+
 inherit cmake-utils
 
 DESCRIPTION="Scientific library collection for large scale problems"
@@ -13,11 +14,12 @@ SRC_PAGE="11.0"
 SLOT="0"
 LICENSE="BSD LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
-IUSE="arprec boost cuda hdf5 hwloc netcdf qd qt scotch taucs tbb test umfpack zlib"
+IUSE="arprec boost cuda hdf5 hwloc netcdf qd qt4 scotch taucs tbb test umfpack zlib"
 
 RESTRICT="fetch"
 
-RDEPEND="virtual/blas
+RDEPEND="
+	virtual/blas
 	virtual/lapack
 	virtual/mpi
 	>=sci-libs/scalapack-2
@@ -28,7 +30,7 @@ RDEPEND="virtual/blas
 	hwloc? ( sys-apps/hwloc )
 	netcdf? ( sci-libs/netcdf )
 	qd? ( sci-libs/qd )
-	qt? ( >=x11-libs/qt-gui-4.5 )
+	qt4? ( dev-qt/qtgui:4 )
 	scotch? ( sci-libs/scotch[mpi] )
 	taucs? ( sci-libs/taucs )
 	tbb? ( dev-cpp/tbb )
@@ -102,7 +104,7 @@ src_configure() {
 		$(cmake-utils_use hwloc TPL_ENABLE_HWLOC)
 		$(cmake-utils_use netcdf TPL_ENABLE_Netcdf)
 		$(cmake-utils_use qd TPL_ENABLE_QD)
-		$(cmake-utils_use qt TPL_ENABLE_QT)
+		$(cmake-utils_use qt4 TPL_ENABLE_QT)
 		$(cmake-utils_use scotch TPL_ENABLE_Scotch)
 		$(cmake-utils_use taucs TPL_ENABLE_TAUCS)
 		$(cmake-utils_use tbb TPL_ENABLE_TBB)


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2013-04-22  1:40 Christoph Junghans
  0 siblings, 0 replies; 26+ messages in thread
From: Christoph Junghans @ 2013-04-22  1:40 UTC (permalink / raw
  To: gentoo-commits

commit:     5cc59db520e735889491007e0aceec0241831592
Author:     Matthias Maier <tamiko <AT> kyomu <DOT> 43-1 <DOT> org>
AuthorDate: Wed Apr  3 09:47:55 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Apr  3 09:52:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5cc59db5

Change to EAPI 5, rearrange SLOT, LICENSE, etc.

---
 sci-libs/trilinos/trilinos-11.0.3.ebuild |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/sci-libs/trilinos/trilinos-11.0.3.ebuild b/sci-libs/trilinos/trilinos-11.0.3.ebuild
index b7aa923..209b148 100644
--- a/sci-libs/trilinos/trilinos-11.0.3.ebuild
+++ b/sci-libs/trilinos/trilinos-11.0.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="5"
 inherit cmake-utils
 
 DESCRIPTION="Scientific library collection for large scale problems"
@@ -10,13 +10,12 @@ HOMEPAGE="http://trilinos.sandia.gov/"
 SRC_URI="${P}-Source.tar.gz"
 SRC_PAGE="11.0"
 
-KEYWORDS="~amd64 ~x86"
-RESTRICT="fetch"
-
-LICENSE="BSD LGPL-2.1"
 SLOT="0"
+LICENSE="BSD LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="arprec boost cuda hdf5 hwloc netcdf qd qt scotch taucs tbb test umfpack zlib"
 
-IUSE="arprec boost cuda hdf5 hwloc netcdf qd qt scotch taucs tbb umfpack zlib"
+RESTRICT="fetch"
 
 RDEPEND="virtual/blas
 	virtual/lapack


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2013-02-22 15:46 Justin Lecher
  0 siblings, 0 replies; 26+ messages in thread
From: Justin Lecher @ 2013-02-22 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     a4ed23ed577e8590fb7233b94c9a3a0dc06d8851
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 13:31:51 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 13:31:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a4ed23ed

sci-libs/trilinos: Correct USE dependency for virtual/pkgconfig; bump EAPI to 5

Package-Manager: portage-2.2.0_alpha163

---
 sci-libs/trilinos/ChangeLog               |    6 ++++-
 sci-libs/trilinos/metadata.xml            |   37 +++++++++++++++++++++++++----
 sci-libs/trilinos/trilinos-10.10.1.ebuild |   26 +++++++++++---------
 3 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index 6c94090..2fa63e8 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/trilinos
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Feb 2013; Justin Lecher <jlec@gentoo.org> trilinos-10.10.1.ebuild,
+  metadata.xml:
+  Correct USE dependency for virtual/pkgconfig; bump EAPI to 5
+
   9 Apr 2012; Andrea Arteaga <andyspiros@gmail.com>
   trilinos-10.10.1.ebuild +metadata.xml:
   Solved many issues.

diff --git a/sci-libs/trilinos/metadata.xml b/sci-libs/trilinos/metadata.xml
index ae613ca..5c0fd55 100644
--- a/sci-libs/trilinos/metadata.xml
+++ b/sci-libs/trilinos/metadata.xml
@@ -1,13 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<maintainer>
-		<email>andyspiros@gmail.com</email>
-	</maintainer>
-	<longdescription lang="en">
+  <herd>sci</herd>
+  <maintainer>
+    <email>andyspiros@gmail.com</email>
+  </maintainer>
+  <longdescription lang="en">
 	The Trilinos Project is an effort to develop algorithms and enabling
 	technologies within an object-oriented software framework for the solution 
 	of large-scale, complex multi-physics engineering and scientific problems.
 	</longdescription>
+  <use>
+    <flag name="arprec">Undocumented USE</flag>
+  </use>
+  <use>
+    <flag name="boost">Undocumented USE</flag>
+  </use>
+  <use>
+    <flag name="cuda">Undocumented USE</flag>
+  </use>
+  <use>
+    <flag name="hwloc">Undocumented USE</flag>
+  </use>
+  <use>
+    <flag name="qd">Undocumented USE</flag>
+  </use>
+  <use>
+    <flag name="scotch">Undocumented USE</flag>
+  </use>
+  <use>
+    <flag name="taucs">Undocumented USE</flag>
+  </use>
+  <use>
+    <flag name="tbb">Undocumented USE</flag>
+  </use>
+  <use>
+    <flag name="umfpack">Undocumented USE</flag>
+  </use>
 </pkgmetadata>

diff --git a/sci-libs/trilinos/trilinos-10.10.1.ebuild b/sci-libs/trilinos/trilinos-10.10.1.ebuild
index b2bf5bb..3caddb3 100644
--- a/sci-libs/trilinos/trilinos-10.10.1.ebuild
+++ b/sci-libs/trilinos/trilinos-10.10.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=5
+
 inherit cmake-utils
 
 DESCRIPTION="Scientific library collection for large scale problems"
@@ -10,15 +11,13 @@ HOMEPAGE="http://trilinos.sandia.gov/"
 SRC_URI="${P}-Source.tar.gz"
 SRC_PAGE="10.10"
 
-KEYWORDS="~amd64 ~x86"
-RESTRICT="fetch"
-
-LICENSE="BSD LGPL-2.1"
 SLOT="0"
+LICENSE="BSD LGPL-2.1"
+IUSE="arprec boost cuda hdf5 hwloc netcdf qd qt4 scotch taucs tbb umfpack zlib"
+KEYWORDS="~amd64 ~x86"
 
-IUSE="arprec boost cuda hdf5 hwloc netcdf qd qt scotch taucs tbb umfpack zlib"
-
-RDEPEND="virtual/blas
+RDEPEND="
+	virtual/blas
 	virtual/lapack
 	virtual/mpi
 	>=sci-libs/scalapack-2
@@ -29,15 +28,18 @@ RDEPEND="virtual/blas
 	hwloc? ( sys-apps/hwloc )
 	netcdf? ( sci-libs/netcdf )
 	qd? ( sci-libs/qd )
-	qt? ( >=x11-libs/qt-gui-4.5 )
+	qt4? ( >=x11-libs/qt-gui-4.5 )
 	scotch? ( sys-libs/scotch[mpi] )
 	taucs? ( sci-libs/taucs )
 	tbb? ( dev-cpp/tbb )
 	umfpack? ( sci-libs/umfpack )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 S="${WORKDIR}/${P}-Source"
 
+RESTRICT="fetch"
+
 pkg_nofetch() {
 	einfo "Sandia requires that you register to the site in order to download Trilinos."
 	einfo "Please download ${SRC_URI} from:"
@@ -70,7 +72,7 @@ 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"


^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2012-04-08 23:22 Andrea Arteaga
  0 siblings, 0 replies; 26+ messages in thread
From: Andrea Arteaga @ 2012-04-08 23:22 UTC (permalink / raw
  To: gentoo-commits

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"
-}



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
@ 2012-04-08  0:54 Andrea Arteaga
  0 siblings, 0 replies; 26+ messages in thread
From: Andrea Arteaga @ 2012-04-08  0:54 UTC (permalink / raw
  To: gentoo-commits

commit:     66309136017aaee0f626ed99323389372a549abe
Author:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
AuthorDate: Sun Apr  8 00:50:53 2012 +0000
Commit:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Sun Apr  8 00:50:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=66309136

[sci-libs/trilinos] Initial ebuild.

---
 sci-libs/trilinos/ChangeLog               |   10 ++
 sci-libs/trilinos/metadata.xml            |   13 +++
 sci-libs/trilinos/trilinos-10.10.1.ebuild |  156 +++++++++++++++++++++++++++++
 3 files changed, 179 insertions(+), 0 deletions(-)

diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
new file mode 100644
index 0000000..ad9f45d
--- /dev/null
+++ b/sci-libs/trilinos/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for sci-libs/trilinos
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*trilinos-10.10.1 (8 Apr 2012)
+
+  8 Apr 2012; Andrea Arteaga <andyspiros@gmail.com>
+  +trilinos-10.10.1.ebuild +metadata.xml:
+  Initial ebuild.
+

diff --git a/sci-libs/trilinos/metadata.xml b/sci-libs/trilinos/metadata.xml
new file mode 100644
index 0000000..ae613ca
--- /dev/null
+++ b/sci-libs/trilinos/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sci</herd>
+	<maintainer>
+		<email>andyspiros@gmail.com</email>
+	</maintainer>
+	<longdescription lang="en">
+	The Trilinos Project is an effort to develop algorithms and enabling
+	technologies within an object-oriented software framework for the solution 
+	of large-scale, complex multi-physics engineering and scientific problems.
+	</longdescription>
+</pkgmetadata>

diff --git a/sci-libs/trilinos/trilinos-10.10.1.ebuild b/sci-libs/trilinos/trilinos-10.10.1.ebuild
new file mode 100644
index 0000000..9cae14b
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-10.10.1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+inherit cmake-utils
+
+DESCRIPTION="Scientific library collection for large scale problems"
+HOMEPAGE="http://trilinos.sandia.gov/"
+SRC_URI="${P}-Source.tar.gz"
+SRC_PAGE="10.10"
+
+KEYWORDS="~amd64 ~x86"
+RESTRICT="fetch"
+
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+
+IUSE="arprec boost cuda hdf5 netcdf qd qt taucs tbb umfpack zlib"
+
+RDEPEND="virtual/blas
+	virtual/lapack
+	virtual/mpi
+	>=sci-libs/scalapack-2
+	arprec? ( sci-libs/arprec )
+	boost? ( dev-libs/boost )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
+	hdf5? ( sci-libs/hdf5[mpi] )
+	netcdf? ( sci-libs/netcdf )
+	qd? ( sci-libs/qd )
+	qt? ( >=x11-libs/qt-gui-4.5 )
+	taucs? ( sci-libs/taucs )
+	tbb? ( dev-cpp/tbb )
+	umfpack? ( sci-libs/umfpack )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}-Source"
+
+pkg_nofetch() {
+	einfo "Sandia requires that you register to the site in order to download Trilinos."
+	einfo "Please download ${SRC_URI} from:"
+	einfo "http://trilinos.sandia.gov/download/trilinos-${SRC_PAGE}.html"
+	einfo "and move it to ${DISTDIR}"
+}
+
+function trilinos_alternatives {
+    alt_dirs=""
+    for d in $(pkg-config --libs-only-L $1); do
+        alt_dirs="${alt_dirs};${d:2}"
+    done
+    arg="-D${2}_LIBRARY_DIRS=${alt_dirs:1}"
+    mycmakeargs+=(
+		$arg
+	)
+	
+	alt_libs=""
+    for d in $(pkg-config --libs-only-l $1); do
+        alt_libs="${alt_libs};${d:2}"
+    done
+    arg="-D${2}_LIBRARY_NAMES=${alt_libs:1}"
+    mycmakeargs+=(
+		$arg
+	)
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE="release"
+	mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DTrilinos_ENABLE_ALL_PACKAGES=ON
+
+		# Tests
+		$(cmake-utils_use test Trilinos_ENABLE_TESTS)
+
+		# Mandatory dependencies
+		-DTPL_ENABLE_MPI=ON
+		-DTPL_ENABLE_BLAS=ON
+		-DTPL_ENABLE_LAPACK=ON
+		-DTPL_ENABLE_BLACS=ON
+		-DTPL_ENABLE_SCALAPACK=ON
+		-DTrilinos_EXTRA_LINK_FLAGS="-lmpi -lmpi_cxx"
+
+		# Optional dependencies
+		$(cmake-utils_use arprec TPL_ENABLE_ARPREC)
+		$(cmake-utils_use boost TPL_ENABLE_Boost)
+		$(cmake-utils_use cuda TPL_ENABLE_CUDA)
+		$(cmake-utils_use hdf5 TPL_ENABLE_HDF5)
+		$(cmake-utils_use netcdf TPL_ENABLE_Netcdf)
+		$(cmake-utils_use qd TPL_ENABLE_QD)
+		$(cmake-utils_use qt TPL_ENABLE_QT)
+		$(cmake-utils_use taucs TPL_ENABLE_TAUCS)
+		$(cmake-utils_use tbb TPL_ENABLE_TBB)
+		$(cmake-utils_use umfpack TPL_ENABLE_UMFPACK)
+		$(cmake-utils_use zlib TPL_ENABLE_Zlib)
+	)
+
+    # Add BLAS libraries
+    trilinos_alternatives blas BLAS
+    trilinos_alternatives lapack LAPACK
+    trilinos_alternatives scalapack SCALAPACK
+    trilinos_alternatives scalapack BLACS
+    
+    mycmakeargs+=( -DBLACS_INCLUDE_DIRS="/usr/include/blacs" )
+
+	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"
+}



^ permalink raw reply related	[flat|nested] 26+ messages in thread

end of thread, other threads:[~2019-05-15 16:34 UTC | newest]

Thread overview: 26+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-19 21:12 [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/ Christoph Junghans
  -- strict thread matches above, loose matches on Subject: below --
2019-05-15 16:34 Matthias Maier
2018-04-03  3:52 Matthias Maier
2018-04-02 12:45 Justin Lecher
2017-07-07 15:52 Matthias Maier
2017-07-07 15:49 Matthias Maier
2017-02-24 18:32 Christoph Junghans
2016-08-31  6:56 Marius Brehler
2016-08-31  6:56 Marius Brehler
2016-07-12 19:57 Marius Brehler
2016-07-12 19:57 Marius Brehler
2016-07-12 19:57 Marius Brehler
2016-03-06 21:40 Justin Lecher
2016-03-06 21:32 Justin Lecher
2015-09-21 19:44 Justin Lecher
2015-08-27 15:01 Justin Lecher
2014-10-24  3:33 Christoph Junghans
2014-01-06 19:27 Justin Lecher
2014-01-06 18:33 Justin Lecher
2013-11-12 16:43 Nicolas Bock
2013-06-19 23:51 Sebastien Fabbro
2013-06-12 20:04 Justin Lecher
2013-04-22  1:40 Christoph Junghans
2013-02-22 15:46 Justin Lecher
2012-04-08 23:22 Andrea Arteaga
2012-04-08  0:54 Andrea Arteaga

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox