Merge remote-tracking branch 'github/master'

4 files changed, 106 insertions, 0 deletions

diff --git a/sci-mathematics/dolfin/Manifest b/sci-mathematics/dolfin/Manifest
index 77fb2fcfc..21a5032da 100644
--- a/sci-mathematics/dolfin/Manifest
+++ b/sci-mathematics/dolfin/Manifest
@@ -1 +1,2 @@
 DIST dolfin-0.9.9.tar.gz 10229504 SHA256 41c1760dbe40fc2b6cd623a181c4e168881598defe0874ac7686a413ea7b73f4 SHA512 1b9e3dfe7dca47a535328c9dab29128262075ac28b7ec18878704d244a27ec417c7d9c00b518dbaa782c2daccaa3affe4b8f9f60df19e1e9b4ca2c70fc2a2483 WHIRLPOOL 6e6b7a8ab3be5f4f37d4fd2c2bf3831647c40d50704e69581aeb7d303b0da02e77f8a25e142bc0528cc9bf01b9e0b75c212f6bcd29fcdbc8ce1b60d77c440ce8
+DIST dolfin-2016.2.0.tar.gz 9702541 SHA256 bb2731d58ec6f56db2f354141f4a2bb6c20b67ae99407a1854f09fd919b9e1d2 SHA512 1886513b433845c1026c37a7ac574d8bb7d08e896e5e54a0cca7f2ba3dde02b5c3551c005a408de151a915ca890ba8e65ebfd53abaef980132cc636c47f8f5fa WHIRLPOOL c0036c7b867a081c7296f70784ac15bfe64cf2485273afc27cd534882d0dcbf23440a90fd8cf78e42c69d77295c35e79f715839cbfcf732fa60f2effe512615a
diff --git a/sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild b/sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild
new file mode 100644
index 000000000..4d5d8f716
--- /dev/null
+++ b/sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eutils python-single-r1
+
+DESCRIPTION="C++/Python interface of FEniCS"
+HOMEPAGE="https://bitbucket.org/fenics-project/dolfin"
+SRC_URI="https://bitbucket.org/fenics-project/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hdf5 mpi parmetis petsc scotch trilinos umfpack zlib vtk"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	trilinos? ( mpi )"
+
+# Yes, swig is an RDEPEND
+DEPEND="
+	${PYTHON_DEPS}
+	dev-cpp/eigen:3
+	dev-lang/swig:0=
+	dev-libs/boost:=
+	dev-libs/libxml2:2
+	~dev-python/dijitso-${PV}[${PYTHON_USEDEP}]
+	~dev-python/ffc-${PV}[${PYTHON_USEDEP}]
+	~dev-python/fiat-${PV}[${PYTHON_USEDEP}]
+	~dev-python/instant-${PV}[${PYTHON_USEDEP}]
+	dev-python/sympy
+	~dev-python/ufl-${PV}[${PYTHON_USEDEP}]
+	virtual/blas
+	virtual/lapack
+	hdf5? ( sci-libs/hdf5[mpi=] )
+	mpi? ( virtual/mpi )
+	parmetis? ( sci-libs/parmetis[mpi(+)] )
+	petsc? ( sci-mathematics/petsc[mpi=] )
+	sci-libs/armadillo
+	scotch? ( sci-libs/scotch )
+	trilinos? ( sci-libs/trilinos )
+	umfpack? (
+		sci-libs/amd
+		sci-libs/cholmod
+		sci-libs/umfpack
+	)
+	vtk? ( sci-libs/vtk )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-trilinos-superlu.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# *sigh*
+	addpredict /proc/mtrr
+	addpredict /sys/devices/system/cpu/
+
+	mycmakeargs=(
+		-DDOLFIN_ENABLE_CHOLMOD="$(usex umfpack)"
+		-DDOLFIN_ENABLE_HDF5="$(usex hdf5)"
+		-DDOLFIN_ENABLE_MPI="$(usex mpi)"
+		-DDOLFIN_ENABLE_PARMETIS="$(usex parmetis)"
+		-DDOLFIN_ENABLE_PETSC="$(usex petsc)"
+		-DDOLFIN_ENABLE_PYTHON="yes"
+		-DDOLFIN_ENABLE_SCOTCH="$(usex scotch)"
+		-DDOLFIN_ENABLE_TRILINOS="$(usex trilinos)"
+		-DDOLFIN_ENABLE_UMFPACK="$(usex umfpack)"
+		-DDOLFIN_ENABLE_VTK="$(usex vtk)"
+		-DDOLFIN_ENABLE_ZLIB="$(usex zlib)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-mathematics/dolfin/files/dolfin-2016.2.0-trilinos-superlu.patch b/sci-mathematics/dolfin/files/dolfin-2016.2.0-trilinos-superlu.patch
new file mode 100644
index 000000000..7282766fe
--- /dev/null
+++ b/sci-mathematics/dolfin/files/dolfin-2016.2.0-trilinos-superlu.patch
@@ -0,0 +1,21 @@
+diff --git a/dolfin/CMakeLists.txt b/dolfin/CMakeLists.txt
+index 26bc21a..0caf7ca 100644
+--- a/dolfin/CMakeLists.txt
++++ b/dolfin/CMakeLists.txt
+@@ -2,6 +2,7 @@ set(DOLFIN_H dolfin.h)
+ install(FILES ${DOLFIN_H} DESTINATION ${DOLFIN_INCLUDE_DIR}
+   COMPONENT Development)
+ 
++
+ # Configure and install dolfin/common/version.h file
+ string(REPLACE "+" "" DOLFIN_VERSION_MICRO_STRIPPED ${DOLFIN_VERSION_MICRO})
+ configure_file(${DOLFIN_SOURCE_DIR}/dolfin/common/version.h.in
+@@ -12,6 +13,8 @@ install(FILES ${CMAKE_BINARY_DIR}/dolfin/common/version.h
+   )
+ include_directories(${CMAKE_BINARY_DIR})
+ 
++include_directories(/usr/include/superlu)
++
+ #------------------------------------------------------------------------------
+ # DOLFIN source directories
+ 
diff --git a/sci-mathematics/dolfin/metadata.xml b/sci-mathematics/dolfin/metadata.xml
index d36c386ea..70a8a021f 100644
--- a/sci-mathematics/dolfin/metadata.xml
+++ b/sci-mathematics/dolfin/metadata.xml
@@ -11,9 +11,13 @@ DOLFIN is the C++/Python interface of FEniCS, providing a consistent PSE (Proble
   <use>
     <flag name="cgal">Adds support for geometric algorithms with <pkg>sci-mathematics/cgal</pkg></flag>
     <flag name="cholmod">Adds support for sparse Cholesky factorization with <pkg>sci-libs/cholmod</pkg></flag>
+	<flag name="hdf5">Adds support for <pkg>sci-libs/hdf5</pkg></flag>
     <flag name="parmetis">Adds support for parallel graph partitioning with <pkg>sci-libs/parmetis</pkg></flag>
+	<flag name="petsc">Adds support for numerical linear algebra toolkit <pkg>sci-mathematics/petsc</pkg></flag>
     <flag name="scotch">Adds support for graph partitioning with <pkg>sci-libs/scotch</pkg></flag>
+	<flag name="trilinos">Adds support for numerical linear algebra toolkit  <pkg>sci-libs/trilinos</pkg></flag>
     <flag name="umfpack">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
+    <flag name="vtk">Adds support for the visualization toolkit <pkg>sci-libs/vtk</pkg></flag>
   </use>
   <upstream>
     <remote-id type="launchpad">dolfin</remote-id>