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

["Sebastien Fabbro" <bicatali@gentoo.org>]

commit:     45f002affd09572ccd0477aecf8f63ceeca11ab2
Author:     Matthias Maier <tamiko <AT> kyomu <DOT> 43-1 <DOT> org>
AuthorDate: Sun Mar  2 18:59:10 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sun Mar  2 18:59:10 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=45f002af

Fix dependencies for sci-libs/dealii-8.(0|1).0, provide local use flag

---
 sci-libs/dealii/ChangeLog           |   5 ++
 sci-libs/dealii/dealii-8.0.0.ebuild |   2 +-
 sci-libs/dealii/dealii-8.1.0.ebuild | 118 +++++++++++++++++++++++++++++++++++-
 sci-libs/dealii/dealii-9999.ebuild  |  36 ++---------
 sci-libs/dealii/metadata.xml        |   2 +-
 5 files changed, 130 insertions(+), 33 deletions(-)

diff --git a/sci-libs/dealii/ChangeLog b/sci-libs/dealii/ChangeLog
index ab51b21..81cc604 100644
--- a/sci-libs/dealii/ChangeLog
+++ b/sci-libs/dealii/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Mar 2014; Matthias Maier <tamiko+GENTOO@kyomu.43-1.org>
+  dealii-8.1.0.ebuild, dealii-9999.ebuild, metadata.xml:
+  Let version 8.0.0 and 8.1.0 depend on <sci-libs/p4est-0.3.5; provide
+  local USE description for suite use flag.
+
   04 Jan 2014; Justin Lecher <jlec@gentoo.org> dealii-9999.ebuild,
   metadata.xml:
   Add missing die; shorten DESCRIPTION; add dummy locel USE description; Fix

diff --git a/sci-libs/dealii/dealii-8.0.0.ebuild b/sci-libs/dealii/dealii-8.0.0.ebuild
index 9860d7b..2fbea89 120000
--- a/sci-libs/dealii/dealii-8.0.0.ebuild
+++ b/sci-libs/dealii/dealii-8.0.0.ebuild
@@ -1 +1 @@
-dealii-9999.ebuild
\ No newline at end of file
+dealii-8.1.0.ebuild
\ No newline at end of file

diff --git a/sci-libs/dealii/dealii-8.1.0.ebuild b/sci-libs/dealii/dealii-8.1.0.ebuild
deleted file mode 120000
index 9860d7b..0000000
--- a/sci-libs/dealii/dealii-8.1.0.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-dealii-9999.ebuild
\ No newline at end of file

diff --git a/sci-libs/dealii/dealii-8.1.0.ebuild b/sci-libs/dealii/dealii-8.1.0.ebuild
new file mode 100644
index 0000000..6451111
--- /dev/null
+++ b/sci-libs/dealii/dealii-8.1.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit cmake-utils eutils multilib
+
+DESCRIPTION="Solving partial differential equations with the finite element method"
+HOMEPAGE="http://www.dealii.org/"
+
+SRC_URI="
+	https://dealii.googlecode.com/files/deal.II-${PV}.tar.gz
+	doc? ( https://dealii.googlecode.com/files/deal.offlinedoc-${PV}.tar.gz )"
+S="${WORKDIR}/deal.II"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+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
+REQUIRED_USE="
+	mumps? ( mpi lapack )
+	p4est? ( mpi )
+	trilinos? ( mpi )
+"
+
+RDEPEND="
+	dev-libs/boost
+	arpack? ( sci-libs/arpack[mpi=] )
+	hdf5? ( sci-libs/hdf5[mpi=] )
+	lapack? ( virtual/lapack )
+	metis? ( >=sci-libs/parmetis-4 )
+	mpi? ( virtual/mpi )
+	mumps? ( sci-libs/mumps[mpi] )
+	netcdf? ( || ( <sci-libs/netcdf-4.2[cxx] sci-libs/netcdf-cxx ) )
+	p4est? ( <sci-libs/p4est-0.3.5[mpi] )
+	parameter_gui? ( dev-qt/qtgui )
+	petsc? ( sci-mathematics/petsc[mpi=] )
+	sparse? ( sci-libs/umfpack )
+	tbb? ( dev-cpp/tbb )
+	trilinos? ( sci-libs/trilinos )
+	zlib? ( sys-libs/zlib )
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] dev-lang/perl )
+"
+
+src_configure() {
+
+	if use debug; then
+		CMAKE_BUILD_TYPE="DebugRelease"
+	else
+		CMAKE_BUILD_TYPE="Release"
+	fi
+
+	local mycmakeargs=(
+		${live_version}
+		-DDEAL_II_ALLOW_AUTODETECTION=OFF
+		-DDEAL_II_ALLOW_BUNDLED=OFF
+		-DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
+		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
+		-DDEAL_II_COMPONENT_COMPAT_FILES=OFF
+		-DDEAL_II_CMAKE_MACROS_RELDIR=share/${PN}/cmake/macros
+		-DDEAL_II_DOCHTML_RELDIR=share/doc/${PF}/html
+		-DDEAL_II_DOCREADME_RELDIR=share/doc/${PF}/
+		-DDEAL_II_EXAMPLES_RELDIR=share/doc/${PF}/examples
+		-DDEAL_II_LIBRARY_RELDIR=$(get_libdir)
+		$(cmake-utils_use arpack DEAL_II_WITH_ARPACK)
+		$(cmake-utils_use avx DEAL_II_HAVE_AVX)
+		$(cmake-utils_use doc DEAL_II_COMPONENT_DOCUMENTATION)
+		$(cmake-utils_use examples DEAL_II_COMPONENT_EXAMPLES)
+		$(cmake-utils_use hdf5 DEAL_II_WITH_HDF5)
+		$(cmake-utils_use lapack DEAL_II_WITH_LAPACK)
+		$(cmake-utils_use mesh_converter DEAL_II_COMPONENT_MESH_CONVERTER)
+		$(cmake-utils_use metis DEAL_II_WITH_METIS)
+		$(cmake-utils_use mpi DEAL_II_WITH_MPI)
+		$(cmake-utils_use mumps DEAL_II_WITH_MUMPS)
+		$(cmake-utils_use netcdf DEAL_II_WITH_NETCDF)
+		$(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 !static-libs BUILD_SHARED_LIBS)
+		$(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 zlib DEAL_II_WITH_ZLIB)
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	DOCS=( README )
+
+	if use doc; then
+		# copy missing images to the build directory:
+		cp -r "${WORKDIR}"/doc/doxygen/deal.II/images "${BUILD_DIR}"/doc/doxygen/deal.II || die
+		# replace links:
+		sed -i \
+			's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \
+			"${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed"
+	fi
+	cmake-utils_src_install
+
+	# unpack the installed example sources:
+	use examples && docompress -x /usr/share/doc/${PF}/examples
+}

diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 25fbc44..24ada12 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -4,26 +4,14 @@
 
 EAPI=5
 
-if [[ "${PV}" == "9999" ]] ; then
-	inherit cmake-utils eutils multilib subversion
-else
-	inherit cmake-utils eutils multilib
-fi
+inherit cmake-utils eutils multilib subversion
 
 DESCRIPTION="Solving partial differential equations with the finite element method"
 HOMEPAGE="http://www.dealii.org/"
 
-if [[ "${PV}" == "9999" ]] ; then
-	ESVN_REPO_URI="https://svn.dealii.org/trunk/deal.II"
-	ESVN_OPTIONS="--trust-server-cert --non-interactive"
-	KEYWORDS=""
-else
-	SRC_URI="
-		https://dealii.googlecode.com/files/deal.II-${PV}.tar.gz
-		doc? ( https://dealii.googlecode.com/files/deal.offlinedoc-${PV}.tar.gz )"
-	S="${WORKDIR}/deal.II"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
+ESVN_REPO_URI="https://svn.dealii.org/trunk/deal.II"
+ESVN_OPTIONS="--trust-server-cert --non-interactive"
+KEYWORDS=""
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
@@ -66,10 +54,8 @@ DEPEND="
 
 src_configure() {
 
-	if [[ ${PV} == "9999" ]] ; then
-		subversion_wc_info
-		local live_version="-DDEAL_II_PACKAGE_VERSION=99.99.svn${ESVN_WC_REVISION}"
-	fi
+	subversion_wc_info
+	local live_version="-DDEAL_II_PACKAGE_VERSION=99.99.svn${ESVN_WC_REVISION}"
 
 	if use debug; then
 		CMAKE_BUILD_TYPE="DebugRelease"
@@ -117,16 +103,6 @@ src_configure() {
 src_install() {
 	DOCS=( README )
 
-	if use doc; then
-		if [[ ${PV} != "9999" ]] ; then
-			# copy missing images to the build directory:
-			cp -r "${WORKDIR}"/doc/doxygen/deal.II/images "${BUILD_DIR}"/doc/doxygen/deal.II || die
-			# replace links:
-			sed -i \
-				's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \
-				"${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed"
-		fi
-	fi
 	cmake-utils_src_install
 
 	# unpack the installed example sources:

diff --git a/sci-libs/dealii/metadata.xml b/sci-libs/dealii/metadata.xml
index 356ec3f..bb33338 100644
--- a/sci-libs/dealii/metadata.xml
+++ b/sci-libs/dealii/metadata.xml
@@ -25,7 +25,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="sparse">A nice USE flag</flag>
+	<flag name="sparse">Add support for suitesparse (<pkg>sci-libs/suitesparse</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>
   </use>