Gentoo Archives: gentoo-commits

From: Jens-Malte Gottfried <jmg@××××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/petsc/
Date: Sat, 03 Mar 2012 16:02:30
Message-Id: 1330790509.161478d0cdf388cd31c2db5c7c639998def50a39.jmg@gentoo
1 commit: 161478d0cdf388cd31c2db5c7c639998def50a39
2 Author: Jens-Malte Gottfried <jmgottfried <AT> web <DOT> de>
3 AuthorDate: Sat Mar 3 16:01:49 2012 +0000
4 Commit: Jens-Malte Gottfried <jmg <AT> godefridus <DOT> de>
5 CommitDate: Sat Mar 3 16:01:49 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=161478d0
7
8 added optional boost and afterimage dep
9
10 ---
11 sci-mathematics/petsc/metadata.xml | 2 ++
12 sci-mathematics/petsc/petsc-3.2_p6.ebuild | 23 ++++++++++++++++-------
13 2 files changed, 18 insertions(+), 7 deletions(-)
14
15 diff --git a/sci-mathematics/petsc/metadata.xml b/sci-mathematics/petsc/metadata.xml
16 index 7f25b9f..e80effd 100644
17 --- a/sci-mathematics/petsc/metadata.xml
18 +++ b/sci-mathematics/petsc/metadata.xml
19 @@ -3,9 +3,11 @@
20 <pkgmetadata>
21 <herd>sci-mathematics</herd>
22 <use>
23 + <flag name="afterimage">Use Afterstep image library (media-libs/libafterimage)</flag>
24 <flag name="boost">Use boost (dev-libs/boost)</flag>
25 <flag name="hypre">Use HYPRE (sci-mathematics/hypre) for preconditioning</flag>
26 <flag name="metis">Use METIS (sci-libs/parmetis) for partitioning</flag>
27 + <flag name="sparse">Use cholmod (sci-libs/cholmod) for sparse factorization</flag>
28 <flag name="complex-scalars">Make scalars complex</flag>
29 </use>
30 </pkgmetadata>
31
32 diff --git a/sci-mathematics/petsc/petsc-3.2_p6.ebuild b/sci-mathematics/petsc/petsc-3.2_p6.ebuild
33 index 7f090fc..a4bc52e 100644
34 --- a/sci-mathematics/petsc/petsc-3.2_p6.ebuild
35 +++ b/sci-mathematics/petsc/petsc-3.2_p6.ebuild
36 @@ -15,7 +15,13 @@ SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${MY_P}.tar.gz"
37 LICENSE="petsc"
38 SLOT="0"
39 KEYWORDS="~x86 ~amd64"
40 -IUSE="boost complex-scalars cxx debug doc fortran hdf5 hypre metis mpi threads X"
41 +IUSE="afterimage boost complex-scalars cxx debug doc \
42 + fortran hdf5 hypre metis mpi sparse threads X"
43 +
44 +REQUIRED_USE="
45 + hypre? ( cxx mpi )
46 + hdf5? ( mpi )
47 +"
48
49 RDEPEND="mpi? ( virtual/mpi[cxx?,fortran?] )
50 X? ( x11-libs/libX11 )
51 @@ -23,8 +29,10 @@ RDEPEND="mpi? ( virtual/mpi[cxx?,fortran?] )
52 virtual/blas
53 hypre? ( sci-libs/hypre )
54 metis? ( sci-libs/parmetis )
55 - hdf5? ( sci-libs/hdf5[!mpi?] )
56 + hdf5? ( sci-libs/hdf5 )
57 boost? ( dev-libs/boost )
58 + afterimage? ( media-libs/libafterimage )
59 + sparse? ( sci-libs/cholmod )
60 "
61
62 DEPEND="${RDEPEND}
63 @@ -32,8 +40,6 @@ DEPEND="${RDEPEND}
64 dev-util/cmake
65 "
66
67 -REQUIRED_USE="hypre? ( cxx mpi )"
68 -
69 S="${WORKDIR}/${MY_P}"
70
71 src_prepare(){
72 @@ -106,18 +112,21 @@ src_configure(){
73 $(petsc_enable fortran) \
74 $(use fortran && echo "$(petsc_select mpi fc /usr/bin/mpif77 $(tc-getF77))") \
75 $(petsc_enable mpi mpi-compilers) \
76 - $(petsc_with X) \
77 - $(petsc_with boost) \
78 $(petsc_enable threads pthread) \
79 $(petsc_enable threads pthreadclasses) \
80 + $(petsc_select complex-scalars scalar-type complex real) \
81 --with-windows-graphics=0 \
82 --with-matlab=0 \
83 --with-python=0 \
84 --with-cmake=/usr/bin/cmake \
85 + $(petsc_with afterimage afterimage \
86 + /usr/$(get_libdir)/libAfterImage.so /usr/include/libAfterImage) \
87 + $(petsc_with sparse cholmod) \
88 + $(petsc_with boost) \
89 $(petsc_with hdf5) \
90 $(petsc_with hypre hypre /usr/$(get_libdir)/libHYPRE.so /usr/include/hypre) \
91 $(petsc_with metis parmetis) \
92 - $(petsc_select complex-scalars scalar-type complex real) \
93 + $(petsc_with X x11) \
94 --with-scotch=0 \
95 ${EXTRA_ECONF} || die "configuration failed"
96 }