[gentoo-commits] proj/sci:master commit in: sci-mathematics/dolfin/, sci-mathematics/dolfin/files/

2020-09-29 Thread Horea Christian
commit: d51c2ced7b3d8950894746f66da1c07712a00feb
Author: Horea Christian  chymera  eu>
AuthorDate: Tue Sep 29 06:39:20 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Tue Sep 29 06:39:20 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d51c2ced

sci-mathematics/dolfin: removed package with missing dep

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Horea Christian  chymera.eu>

 sci-mathematics/dolfin/dolfin-0.9.9.ebuild | 56 ---
 sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild   | 80 --
 sci-mathematics/dolfin/dolfin-2017.1.0.ebuild  | 80 --
 .../dolfin/files/dolfin-0.9.9-find-armadillo.patch | 25 ---
 .../files/dolfin-2016.2.0-trilinos-superlu.patch   | 21 --
 sci-mathematics/dolfin/metadata.xml| 26 ---
 6 files changed, 288 deletions(-)

diff --git a/sci-mathematics/dolfin/dolfin-0.9.9.ebuild 
b/sci-mathematics/dolfin/dolfin-0.9.9.ebuild
deleted file mode 100644
index 4677e51b2..0
--- a/sci-mathematics/dolfin/dolfin-0.9.9.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils python-single-r1
-
-DESCRIPTION="C++/Python interface of FEniCS"
-HOMEPAGE="https://launchpad.net/dolfin/;
-SRC_URI="https://launchpad.net/${PN}/0.x/${PV}/+download/${P}.tar.gz;
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cgal cholmod gmp mpi parmetis python scotch umfpack zlib"
-# scotch and parmetis require mpi; wait for EAPI 4
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-   dev-libs/boost
-   dev-libs/libxml2:2
-   sci-libs/armadillo
-   sci-mathematics/ufc
-   python? (
-   ${PYTHON_DEPS}
-   dev-python/ufl[${PYTHON_USEDEP}]
-   dev-python/ffc[${PYTHON_USEDEP}]
-   dev-python/fiat[${PYTHON_USEDEP}]
-   dev-python/instant[${PYTHON_USEDEP}]
-   dev-python/viper[${PYTHON_USEDEP}]
-   )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-   use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   epatch "${FILESDIR}"/"${P}"-find-armadillo.patch
-}
-
-pkg_setup() {
-   mycmakeargs="${mycmakeargs}
-   $(cmake-utils_use cgal DOLFIN_ENABLE_CGAL)
-   $(cmake-utils_use cholmod DOLFIN_ENABLE_CHOLMOD)
-   $(cmake-utils_use gmp DOLFIN_ENABLE_GMP)
-   $(cmake-utils_use mpi DOLFIN_ENABLE_MPI)
-   $(cmake-utils_use parmetis DOLFIN_ENABLE_PARMETIS)
-   $(cmake-utils_use python DOLFIN_ENABLE_PYTHON)
-   $(cmake-utils_use scotch DOLFIN_ENABLE_SCOTCH)
-   $(cmake-utils_use umfpack DOLFIN_ENABLE_UMFPACK)
-   $(cmake-utils_use zlib DOLFIN_ENABLE_ZLIB)"
-}

diff --git a/sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild 
b/sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild
deleted file mode 100644
index 169611161..0
--- a/sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-   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=(
-   

[gentoo-commits] proj/sci:master commit in: sci-mathematics/dolfin/

2019-04-13 Thread Martin Mokrejs
commit: 444afbb71d21aef9221bc6142c9a7cf4ad676a73
Author: Martin Mokrejs  fold  natur  cuni  cz>
AuthorDate: Sat Apr 13 20:28:46 2019 +
Commit: Martin Mokrejs  fold  natur  cuni  cz>
CommitDate: Sat Apr 13 20:28:46 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=444afbb7

sci-mathematics/dolfin: Fix RDEPEND.suspect

Non-maintainer commit fixing:

RDEPEND.suspect   2
 sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild: 'dev-lang/swig:0='
 sci-mathematics/dolfin/dolfin-2017.1.0.ebuild: 'dev-lang/swig:0='

All swig ebuilds define only SLOT="0"

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Martin Mokrejs  fold.natur.cuni.cz>

 sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild | 4 ++--
 sci-mathematics/dolfin/dolfin-2017.1.0.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild 
b/sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild
index 4d5d8f716..169611161 100644
--- a/sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild
+++ b/sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 DEPEND="
${PYTHON_DEPS}
dev-cpp/eigen:3
-   dev-lang/swig:0=
+   dev-lang/swig
dev-libs/boost:=
dev-libs/libxml2:2
~dev-python/dijitso-${PV}[${PYTHON_USEDEP}]

diff --git a/sci-mathematics/dolfin/dolfin-2017.1.0.ebuild 
b/sci-mathematics/dolfin/dolfin-2017.1.0.ebuild
index 64e736315..b5b66a708 100644
--- a/sci-mathematics/dolfin/dolfin-2017.1.0.ebuild
+++ b/sci-mathematics/dolfin/dolfin-2017.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 DEPEND="
${PYTHON_DEPS}
dev-cpp/eigen:3
-   dev-lang/swig:0=
+   dev-lang/swig
dev-libs/boost:=
dev-libs/libxml2:2
~dev-python/dijitso-${PV}[${PYTHON_USEDEP}]



[gentoo-commits] proj/sci:master commit in: sci-mathematics/dolfin/

2017-09-14 Thread Matthias Maier
commit: 15c5a6f042f44a009cbac8f5ba5e9282a614a32b
Author: Matthias Maier  gentoo  org>
AuthorDate: Thu Sep 14 18:54:15 2017 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Thu Sep 14 18:54:15 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=15c5a6f0

sci-mathematics/dolfin: fix patch name

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 sci-mathematics/dolfin/dolfin-2017.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/dolfin/dolfin-2017.1.0.ebuild 
b/sci-mathematics/dolfin/dolfin-2017.1.0.ebuild
index 4d5d8f716..5bf0d0a24 100644
--- a/sci-mathematics/dolfin/dolfin-2017.1.0.ebuild
+++ b/sci-mathematics/dolfin/dolfin-2017.1.0.ebuild
@@ -51,7 +51,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-   "${FILESDIR}"/${P}-trilinos-superlu.patch
+   "${FILESDIR}"/${PN}-2016.2.0-trilinos-superlu.patch
 )
 
 pkg_setup() {



[gentoo-commits] proj/sci:master commit in: sci-mathematics/dolfin/

2017-09-14 Thread Matthias Maier
commit: 005b0063b97065dc4d9cb60febae1f34c359336b
Author: Matthias Maier  gentoo  org>
AuthorDate: Thu Sep 14 18:29:07 2017 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Thu Sep 14 18:29:07 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=005b0063

sci-mathematics/dolfin: version bump to 2017.1.0

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 sci-mathematics/dolfin/dolfin-2017.1.0.ebuild | 80 +++
 1 file changed, 80 insertions(+)

diff --git a/sci-mathematics/dolfin/dolfin-2017.1.0.ebuild 
b/sci-mathematics/dolfin/dolfin-2017.1.0.ebuild
new file mode 100644
index 0..4d5d8f716
--- /dev/null
+++ b/sci-mathematics/dolfin/dolfin-2017.1.0.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
+}



[gentoo-commits] proj/sci:master commit in: sci-mathematics/dolfin/

2017-04-11 Thread Marius Brehler
commit: 11ca0a9a73e57b0687cc73d0fa1f06c9827d78e1
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri Apr  7 05:53:24 2017 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Fri Apr  7 05:53:24 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=11ca0a9a

sci-mathematics/dolfin: Add dev-python/dijitso dependency

Package-Manager: Portage-2.3.3, Repoman-2.3.2

 sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild 
b/sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild
index aab0037df..4d5d8f716 100644
--- a/sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild
+++ b/sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild
@@ -26,6 +26,7 @@ DEPEND="
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}]



[gentoo-commits] proj/sci:master commit in: sci-mathematics/dolfin/

2017-04-11 Thread Marius Brehler
commit: 032f7fa6fa69e8b48b2f6257747de4f95e22770f
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri Apr  7 05:16:37 2017 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Fri Apr  7 05:16:37 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=032f7fa6

sci-mathematics/dolfin: ebuild maintenance

 - add use flag descriptions to metadata
 - fix automagic dependencies
 - fix repoman warnings

Package-Manager: Portage-2.3.3, Repoman-2.3.2

 ...dolfin-2016.2.0.ebuild => dolfin-2016.2.0-r1.ebuild} | 17 ++---
 sci-mathematics/dolfin/metadata.xml |  4 
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/sci-mathematics/dolfin/dolfin-2016.2.0.ebuild 
b/sci-mathematics/dolfin/dolfin-2016.2.0-r1.ebuild
similarity index 84%
rename from sci-mathematics/dolfin/dolfin-2016.2.0.ebuild
rename to sci-mathematics/dolfin/dolfin-2016.2.0-r1.ebuild
index 994028a56..9a668a3d5 100644
--- a/sci-mathematics/dolfin/dolfin-2016.2.0.ebuild
+++ b/sci-mathematics/dolfin/dolfin-2016.2.0-r1.ebuild
@@ -14,17 +14,15 @@ 
SRC_URI="https://bitbucket.org/fenics-project/${PN}/downloads/${P}.tar.gz;
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="mpi parmetis petsc scotch trilinos umfpack zlib"
-# scotch and parmetis require mpi; wait for EAPI 4
+IUSE="hdf5 mpi parmetis petsc scotch trilinos umfpack zlib vtk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
trilinos? ( mpi )"
 
-DEPEND="
+RDEPEND="
${PYTHON_DEPS}
-   dev-libs/boost
+   dev-libs/boost:=
dev-cpp/eigen:3
-   dev-lang/swig
dev-libs/libxml2:2
~dev-python/ffc-${PV}[${PYTHON_USEDEP}]
~dev-python/fiat-${PV}[${PYTHON_USEDEP}]
@@ -33,8 +31,9 @@ DEPEND="
~dev-python/ufl-${PV}[${PYTHON_USEDEP}]
virtual/blas
virtual/lapack
+   hdf5? ( sci-libs/hdf5[mpi=] )
mpi? ( virtual/mpi )
-   parmetis? ( sci-libs/parmetis[mpi=] )
+   parmetis? ( sci-libs/parmetis[mpi(+)] )
petsc? ( sci-mathematics/petsc[mpi=] )
sci-libs/armadillo
scotch? ( sci-libs/scotch )
@@ -44,8 +43,10 @@ DEPEND="
sci-libs/cholmod
sci-libs/umfpack
)
+   vtk? ( sci-libs/vtk )
zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+   dev-lang/swig:0"
 
 PATCHES=(
"${FILESDIR}"/${P}-trilinos-superlu.patch
@@ -62,6 +63,7 @@ src_configure() {
 
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)"
@@ -69,6 +71,7 @@ src_configure() {
-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/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
   
 Adds support for geometric algorithms with 
sci-mathematics/cgal
 Adds support for sparse Cholesky factorization with 
sci-libs/cholmod
+   Adds support for sci-libs/hdf5
 Adds support for parallel graph partitioning with 
sci-libs/parmetis
+   Adds support for numerical linear algebra toolkit 
sci-mathematics/petsc
 Adds support for graph partitioning with 
sci-libs/scotch
+   Adds support for numerical linear algebra toolkit 
 sci-libs/trilinos
 Adds support for sparse solving with 
sci-libs/umfpack
+Adds support for the visualization toolkit 
sci-libs/vtk
   
   
 dolfin



[gentoo-commits] proj/sci:master commit in: sci-mathematics/dolfin/

2017-04-11 Thread Marius Brehler
commit: 58db08df6890cf0be42c9d48294b3a8c527cebe7
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri Apr  7 05:37:05 2017 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Fri Apr  7 05:37:40 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=58db08df

sci-mathematics/dolfin: fix runtime dependency on swig

Package-Manager: Portage-2.3.3, Repoman-2.3.2

 .../{dolfin-2016.2.0-r1.ebuild => dolfin-2016.2.0-r2.ebuild} | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sci-mathematics/dolfin/dolfin-2016.2.0-r1.ebuild 
b/sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild
similarity index 96%
rename from sci-mathematics/dolfin/dolfin-2016.2.0-r1.ebuild
rename to sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild
index 9a668a3d5..aab0037df 100644
--- a/sci-mathematics/dolfin/dolfin-2016.2.0-r1.ebuild
+++ b/sci-mathematics/dolfin/dolfin-2016.2.0-r2.ebuild
@@ -19,10 +19,12 @@ IUSE="hdf5 mpi parmetis petsc scotch trilinos umfpack zlib 
vtk"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
trilinos? ( mpi )"
 
-RDEPEND="
+# Yes, swig is an RDEPEND
+DEPEND="
${PYTHON_DEPS}
-   dev-libs/boost:=
dev-cpp/eigen:3
+   dev-lang/swig:0=
+   dev-libs/boost:=
dev-libs/libxml2:2
~dev-python/ffc-${PV}[${PYTHON_USEDEP}]
~dev-python/fiat-${PV}[${PYTHON_USEDEP}]
@@ -45,8 +47,7 @@ RDEPEND="
)
vtk? ( sci-libs/vtk )
zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-   dev-lang/swig:0"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
"${FILESDIR}"/${P}-trilinos-superlu.patch



[gentoo-commits] proj/sci:master commit in: sci-mathematics/dolfin/files/, sci-mathematics/dolfin/

2017-04-11 Thread Marius Brehler
commit: 91ffc1a8294fa22d197652d4a7e44c9577ee6d49
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri Apr  7 02:37:58 2017 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Fri Apr  7 04:05:50 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=91ffc1a8

sci-mathematics/dolfin: version bump to 2016.2.0

Further, bump to EAPI 6 and add dependencies

Package-Manager: Portage-2.3.3, Repoman-2.3.2

 sci-mathematics/dolfin/dolfin-2016.2.0.ebuild  | 75 ++
 .../files/dolfin-2016.2.0-trilinos-superlu.patch   | 21 ++
 2 files changed, 96 insertions(+)

diff --git a/sci-mathematics/dolfin/dolfin-2016.2.0.ebuild 
b/sci-mathematics/dolfin/dolfin-2016.2.0.ebuild
new file mode 100644
index 0..994028a56
--- /dev/null
+++ b/sci-mathematics/dolfin/dolfin-2016.2.0.ebuild
@@ -0,0 +1,75 @@
+# 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="mpi parmetis petsc scotch trilinos umfpack zlib"
+# scotch and parmetis require mpi; wait for EAPI 4
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   trilinos? ( mpi )"
+
+DEPEND="
+   ${PYTHON_DEPS}
+   dev-libs/boost
+   dev-cpp/eigen:3
+   dev-lang/swig
+   dev-libs/libxml2:2
+   ~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
+   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
+   )
+   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_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_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 0..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
+ 



[gentoo-commits] proj/sci:master commit in: sci-mathematics/dolfin/

2015-09-21 Thread Justin Lecher
commit: adef9e2c72e14efcc6bd4246929a507aeaddf049
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Sep 21 13:35:51 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Sep 21 13:35:51 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=adef9e2c

sci-mathematics/dolfin: Fix SRC_URI

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher  gentoo.org>

 sci-mathematics/dolfin/dolfin-0.9.9.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/dolfin/dolfin-0.9.9.ebuild 
b/sci-mathematics/dolfin/dolfin-0.9.9.ebuild
index 547ff0c..887d541 100644
--- a/sci-mathematics/dolfin/dolfin-0.9.9.ebuild
+++ b/sci-mathematics/dolfin/dolfin-0.9.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ inherit cmake-utils eutils python-single-r1
 
 DESCRIPTION="C++/Python interface of FEniCS"
 HOMEPAGE="https://launchpad.net/dolfin/;
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz;
+SRC_URI="https://launchpad.net/${PN}/0.x/${PV}/+download/${P}.tar.gz;
 
 LICENSE="LGPL-2.1"
 SLOT="0"



[gentoo-commits] proj/sci:master commit in: sci-mathematics/dolfin/

2015-06-08 Thread Justin Lecher
commit: 3ff7e4776ef3436ec94f9485c917c9a3819ad32e
Author: Justin Lecher jlec AT gentoo DOT org
AuthorDate: Mon Jun  8 11:40:17 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Mon Jun  8 11:40:17 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=3ff7e477

sci-mathematics/dolfin: Updating remote-id in metadata.xml

Package-Manager: portage-2.2.20

 sci-mathematics/dolfin/ChangeLog| 6 --
 sci-mathematics/dolfin/metadata.xml | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/dolfin/ChangeLog b/sci-mathematics/dolfin/ChangeLog
index 980a24a..f5a0b74 100644
--- a/sci-mathematics/dolfin/ChangeLog
+++ b/sci-mathematics/dolfin/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-mathematics/dolfin
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Jun 2015; Justin Lecher j...@gentoo.org metadata.xml:
+  sci-mathematics/dolfin: Updating remote-id in metadata.xml
+
   04 Dec 2013; Justin Lecher j...@gentoo.org dolfin-0.9.9.ebuild,
   metadata.xml:
   Bump EAPI to 5; Bump to python-single-r1 eclass
@@ -19,4 +22,3 @@
   +dolfin-0.9.9.ebuild, +files/dolfin-0.9.9-find-armadillo.patch,
   +metadata.xml:
   Initial import.
-

diff --git a/sci-mathematics/dolfin/metadata.xml 
b/sci-mathematics/dolfin/metadata.xml
index 9c1b5e5..c324786 100644
--- a/sci-mathematics/dolfin/metadata.xml
+++ b/sci-mathematics/dolfin/metadata.xml
@@ -12,4 +12,7 @@ DOLFIN is the C++/Python interface of FEniCS, providing a 
consistent PSE (Proble
 flag name=scotchAdds support for graph partitioning with 
pkgsci-libs/scotch/pkg/flag
 flag name=umfpackAdds support for sparse solving with 
pkgsci-libs/umfpack/pkg/flag
   /use
+  upstream
+remote-id type=launchpaddolfin/remote-id
+  /upstream
 /pkgmetadata