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: Sun, 04 Mar 2012 14:31:41
Message-Id: 1330871433.f8af32d29dd0454f05ff052f76873302ea0b6318.jmg@gentoo
1 commit: f8af32d29dd0454f05ff052f76873302ea0b6318
2 Author: Jens-Malte Gottfried <jmgottfried <AT> web <DOT> de>
3 AuthorDate: Sun Mar 4 14:30:33 2012 +0000
4 Commit: Jens-Malte Gottfried <jmg <AT> godefridus <DOT> de>
5 CommitDate: Sun Mar 4 14:30:33 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f8af32d2
7
8 disabled non-working dependencies
9
10 to avoid confusion.
11 Left comments to re-enable them if fixed in upstream.
12
13 ---
14 sci-mathematics/petsc/metadata.xml | 6 ++++--
15 sci-mathematics/petsc/petsc-3.2_p6.ebuild | 21 ++++++++++++---------
16 2 files changed, 16 insertions(+), 11 deletions(-)
17
18 diff --git a/sci-mathematics/petsc/metadata.xml b/sci-mathematics/petsc/metadata.xml
19 index e80effd..dea22b9 100644
20 --- a/sci-mathematics/petsc/metadata.xml
21 +++ b/sci-mathematics/petsc/metadata.xml
22 @@ -4,10 +4,12 @@
23 <herd>sci-mathematics</herd>
24 <use>
25 <flag name="afterimage">Use Afterstep image library (media-libs/libafterimage)</flag>
26 - <flag name="boost">Use boost (dev-libs/boost)</flag>
27 <flag name="hypre">Use HYPRE (sci-mathematics/hypre) for preconditioning</flag>
28 <flag name="metis">Use METIS (sci-libs/parmetis) for partitioning</flag>
29 - <flag name="sparse">Use cholmod (sci-libs/cholmod) for sparse factorization</flag>
30 <flag name="complex-scalars">Make scalars complex</flag>
31 + <!-- Disabled:
32 + <flag name="boost">Use boost (dev-libs/boost)</flag>
33 + <flag name="sparse">Use cholmod (sci-libs/cholmod) for sparse factorization</flag>
34 + -->
35 </use>
36 </pkgmetadata>
37
38 diff --git a/sci-mathematics/petsc/petsc-3.2_p6.ebuild b/sci-mathematics/petsc/petsc-3.2_p6.ebuild
39 index 0d972ed..f91d6de 100644
40 --- a/sci-mathematics/petsc/petsc-3.2_p6.ebuild
41 +++ b/sci-mathematics/petsc/petsc-3.2_p6.ebuild
42 @@ -15,15 +15,16 @@ SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${MY_P}.tar.gz"
43 LICENSE="petsc"
44 SLOT="0"
45 KEYWORDS="~x86 ~amd64"
46 -IUSE="afterimage boost complex-scalars cxx debug doc \
47 - imagemagick fortran hdf5 hypre metis mpi sparse threads X"
48 +IUSE="afterimage complex-scalars cxx debug doc \
49 + fortran hdf5 hypre metis mpi threads X"
50 +# Failed: boost imagemagick sparse
51
52 REQUIRED_USE="
53 hypre? ( cxx mpi )
54 hdf5? ( mpi )
55 - imagemagick? ( X )
56 afterimage? ( X )
57 "
58 +# imagemagick? ( X )
59
60 RDEPEND="mpi? ( virtual/mpi[cxx?,fortran?] )
61 X? ( x11-libs/libX11 )
62 @@ -32,11 +33,11 @@ RDEPEND="mpi? ( virtual/mpi[cxx?,fortran?] )
63 hypre? ( sci-libs/hypre )
64 metis? ( sci-libs/parmetis )
65 hdf5? ( sci-libs/hdf5 )
66 - boost? ( dev-libs/boost )
67 afterimage? ( media-libs/libafterimage )
68 - imagemagick? ( media-gfx/imagemagick )
69 - sparse? ( sci-libs/cholmod )
70 "
71 +# boost? ( dev-libs/boost )
72 +# imagemagick? ( media-gfx/imagemagick )
73 +# sparse? ( sci-libs/cholmod )
74
75 DEPEND="${RDEPEND}
76 sys-devel/gcc[-nocxx,fortran?]
77 @@ -126,16 +127,18 @@ src_configure(){
78 --with-cmake=/usr/bin/cmake \
79 $(petsc_with afterimage afterimage \
80 /usr/$(get_libdir)/libAfterImage.so /usr/include/libAfterImage) \
81 - $(petsc_with sparse cholmod) \
82 - $(petsc_with boost) \
83 $(petsc_with hdf5) \
84 $(petsc_with hypre hypre /usr/$(get_libdir)/libHYPRE.so /usr/include/hypre) \
85 - $(petsc_with imagemagick imagemagick /usr/$(get_libdir)/libMagickCore.so /usr/include/ImageMagick) \
86 $(petsc_with metis parmetis) \
87 $(petsc_with X x) \
88 $(petsc_with X x11) \
89 --with-scotch=0 \
90 ${EXTRA_ECONF} || die "configuration failed"
91 +
92 +# failed dependencies, perhaps fixed in upstream:
93 +# $(petsc_with boost) \
94 +# $(petsc_with imagemagick imagemagick /usr/$(get_libdir)/libMagickCore.so /usr/include/ImageMagick) \
95 +# $(petsc_with sparse cholmod) \
96 }
97
98 src_install(){