aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Maier <tamiko@kyomu.43-1.org>2013-07-25 18:39:38 +0200
committerMatthias Maier <tamiko@kyomu.43-1.org>2013-07-25 18:54:36 +0200
commitcda6510a8d1174f915bfa07520f055d1ded875f6 (patch)
treeec29910a2ab8042b8fa512b636d9382e92651233 /sci-libs/dealii
parentAn ebuild for deal.II [1] (diff)
downloadsci-cda6510a8d1174f915bfa07520f055d1ded875f6.tar.gz
sci-cda6510a8d1174f915bfa07520f055d1ded875f6.tar.bz2
sci-cda6510a8d1174f915bfa07520f055d1ded875f6.zip
Improve dealii-9999.ebuild to be more consistent with Gentoo's best practices
Specifically: - Rename use flags thread -> tbb, umfpack -> sparse as match common practice - Add virtual/pkgconfig to DEPEND - Remove double occurence of sys-libs/zlib - Provide a static-libs use flag
Diffstat (limited to 'sci-libs/dealii')
-rw-r--r--sci-libs/dealii/dealii-9999.ebuild21
-rw-r--r--sci-libs/dealii/metadata.xml2
2 files changed, 14 insertions, 9 deletions
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 9a4f7c84e..9765e3a80 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -26,12 +26,11 @@ fi
LICENSE="LGPL-2.1+"
SLOT="0"
-IUSE="arpack avx +debug doc +examples hdf5 +lapack mesh_converter metis mpi mumps netcdf p4est parameter_gui petsc sse2 +threads trilinos +umfpack +zlib"
+IUSE="arpack avx +debug doc +examples hdf5 +lapack mesh_converter metis mpi mumps netcdf p4est parameter_gui petsc +sparse sse2 static-libs +tbb trilinos +zlib"
# TODO: add slepc use flag once slepc is packaged for gentoo-science
-DEPEND="
+RDEPEND="
dev-libs/boost
- sys-libs/zlib
arpack? ( sci-libs/arpack[mpi?] )
doc? ( app-doc/doxygen[dot] dev-lang/perl )
hdf5? ( sci-libs/hdf5[mpi?] )
@@ -43,12 +42,16 @@ DEPEND="
p4est? ( sci-libs/p4est[mpi?] )
parameter_gui? ( dev-qt/qtgui )
petsc? ( sci-mathematics/petsc[mpi?] )
- threads? ( dev-cpp/tbb )
+ sparse? ( sci-libs/umfpack )
+ tbb? ( dev-cpp/tbb )
trilinos? ( sci-libs/trilinos )
- umfpack? ( sci-libs/umfpack )
zlib? ( sys-libs/zlib )
"
-RDEPEND="${DEPEND}"
+
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
src_configure() {
@@ -82,10 +85,12 @@ src_configure() {
$(cmake-utils_use p4est DEAL_II_WITH_P4EST)
$(cmake-utils_use parameter_gui DEAL_II_COMPONENT_PARAMETER_GUI)
$(cmake-utils_use petsc DEAL_II_WITH_PETSC)
+ $(cmake-utils_use sparse DEAL_II_WITH_UMFPACK)
$(cmake-utils_use sse2 DEAL_II_HAVE_SSE2)
- $(cmake-utils_use threads DEAL_II_WITH_THREADS)
+ $(if use static-libs; then echo -DBUILD_SHARED_LIBS=OFF;fi)
+ $(cmake-utils_use static-libs DEAL_II_PREFER_STATIC_LIBS)
+ $(cmake-utils_use tbb DEAL_II_WITH_THREADS)
$(cmake-utils_use trilinos DEAL_II_WITH_TRILINOS)
- $(cmake-utils_use umfpack DEAL_II_WITH_UMFPACK)
$(cmake-utils_use zlib DEAL_II_WITH_ZLIB)
"-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF"
"-DDEAL_II_COMPONENT_COMPAT_FILES=OFF"
diff --git a/sci-libs/dealii/metadata.xml b/sci-libs/dealii/metadata.xml
index 0567794b9..65475b58a 100644
--- a/sci-libs/dealii/metadata.xml
+++ b/sci-libs/dealii/metadata.xml
@@ -22,7 +22,7 @@
<flag name="p4est">Add support for p4est (<pkg>sci-mathematics/p4est</pkg>)</flag>
<flag name="parameter_gui">Build and install the parameter_gui executable</flag>
<flag name="petsc">Add support for petsc (<pkg>sci-libs/petsc</pkg>)</flag>
+ <flag name="tbb">Add threading support with the help of the tbb library (<pkg>dev-cpp/tbb</pkg>)</flag>
<flag name="trilinos">Add support for trilinos (<pkg>sci-libs/trilinos</pkg>)</flag>
- <flag name="umfpack">Add support for umfpack (<pkg>sci-libs/umfpack</pkg>)</flag>
</use>
</pkgmetadata>