[gentoo-commits] repo/gentoo:master commit in: sci-libs/cholmod/, sci-libs/mumps/, sci-libs/dealii/, sci-libs/coinor-clp/, ...

[Marek Szuba]

commit:     ea68b9915231ddf7ac3b09f8032e5cfe99961bdd
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 16 10:36:31 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 11:43:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea68b991

*/*: update sci-libs/{,par}metis revdeps

ParMETIS on the one hand no longer installs bundled METIS and on the
other unconditionally depends on MPI. Therefore, only keep it in ebuilds
which use MPI themselves and depend on METIS directly otherwise.

Note that some of the alleged sci-libs/parmetis revdeps might in fact
not use even when they use MPI, as none of these revdeps have actually
explicitly requested sci-libs/parmetis[mpi].

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 sci-libs/cholmod/cholmod-3.0.13.ebuild       | 5 +----
 sci-libs/cholmod/cholmod-3.0.14.ebuild       | 5 +----
 sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild | 4 ++--
 sci-libs/dealii/dealii-9.2.0-r1.ebuild       | 5 ++++-
 sci-libs/dealii/dealii-9.3.0-r1.ebuild       | 5 ++++-
 sci-libs/dealii/dealii-9.3.1.ebuild          | 5 ++++-
 sci-libs/dealii/dealii-9999.ebuild           | 5 ++++-
 sci-libs/mumps/mumps-5.3.5.ebuild            | 4 ++--
 sci-libs/taucs/taucs-2.2-r1.ebuild           | 9 +++------
 sci-libs/trilinos/trilinos-13.0.1.ebuild     | 2 +-
 10 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/sci-libs/cholmod/cholmod-3.0.13.ebuild b/sci-libs/cholmod/cholmod-3.0.13.ebuild
index a2dc0b63a54..6d21a365986 100644
--- a/sci-libs/cholmod/cholmod-3.0.13.ebuild
+++ b/sci-libs/cholmod/cholmod-3.0.13.ebuild
@@ -27,10 +27,7 @@ DEPEND="
 	partition? (
 		>=sci-libs/camd-2.4
 		>=sci-libs/ccolamd-2.9
-		|| (
-			>=sci-libs/metis-5.1.0
-			sci-libs/parmetis
-		)
+		>=sci-libs/metis-5.1.0
 	)"
 RDEPEND="${DEPEND}"
 

diff --git a/sci-libs/cholmod/cholmod-3.0.14.ebuild b/sci-libs/cholmod/cholmod-3.0.14.ebuild
index a146edfb85a..111b80f9034 100644
--- a/sci-libs/cholmod/cholmod-3.0.14.ebuild
+++ b/sci-libs/cholmod/cholmod-3.0.14.ebuild
@@ -27,10 +27,7 @@ DEPEND="
 	partition? (
 		sci-libs/camd
 		sci-libs/ccolamd
-		|| (
-			>=sci-libs/metis-5.1.0
-			sci-libs/parmetis
-		)
+		>=sci-libs/metis-5.1.0
 	)"
 RDEPEND="${DEPEND}"
 

diff --git a/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild b/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild
index 7449be2ae9f..d3e93719609 100644
--- a/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild
+++ b/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,7 @@ BDEPEND="virtual/fortran
 DEPEND="sci-libs/coinor-osi:=
 	sci-libs/coinor-utils:=
 	glpk? ( sci-mathematics/glpk:= sci-libs/amd )
-	metis? ( || ( sci-libs/metis sci-libs/parmetis ) )
+	metis? ( sci-libs/metis )
 	mumps? ( sci-libs/mumps[-mpi] )
 	sparse? ( sci-libs/cholmod )"
 RDEPEND="${DEPEND}"

diff --git a/sci-libs/dealii/dealii-9.2.0-r1.ebuild b/sci-libs/dealii/dealii-9.2.0-r1.ebuild
index 468137f5fed..fa6f92f0b59 100644
--- a/sci-libs/dealii/dealii-9.2.0-r1.ebuild
+++ b/sci-libs/dealii/dealii-9.2.0-r1.ebuild
@@ -52,7 +52,10 @@ RDEPEND="dev-libs/boost
 	gsl? ( sci-libs/gsl:= )
 	hdf5? ( sci-libs/hdf5[mpi=] )
 	lapack? ( virtual/lapack )
-	metis? ( >=sci-libs/parmetis-4 )
+	metis? (
+		>=sci-libs/metis-5
+		mpi? ( >=sci-libs/parmetis-4 )
+	)
 	mpi? ( virtual/mpi )
 	muparser? ( dev-cpp/muParser )
 	nanoflann? ( sci-libs/nanoflann )

diff --git a/sci-libs/dealii/dealii-9.3.0-r1.ebuild b/sci-libs/dealii/dealii-9.3.0-r1.ebuild
index faa68c5b29d..65d0d5b7a33 100644
--- a/sci-libs/dealii/dealii-9.3.0-r1.ebuild
+++ b/sci-libs/dealii/dealii-9.3.0-r1.ebuild
@@ -58,7 +58,10 @@ RDEPEND="dev-libs/boost
 	gsl? ( sci-libs/gsl:= )
 	hdf5? ( sci-libs/hdf5[mpi=] )
 	lapack? ( virtual/lapack )
-	metis? ( >=sci-libs/parmetis-4 )
+	metis? (
+		>=sci-libs/metis-5
+		mpi? ( >=sci-libs/parmetis-4 )
+	)
 	mpi? ( virtual/mpi )
 	muparser? ( dev-cpp/muParser )
 	opencascade? ( ~sci-libs/opencascade-${CAS_VERSION}:= )

diff --git a/sci-libs/dealii/dealii-9.3.1.ebuild b/sci-libs/dealii/dealii-9.3.1.ebuild
index 0bdf1f25fbb..3b496443757 100644
--- a/sci-libs/dealii/dealii-9.3.1.ebuild
+++ b/sci-libs/dealii/dealii-9.3.1.ebuild
@@ -58,7 +58,10 @@ RDEPEND="dev-libs/boost
 	gsl? ( sci-libs/gsl:= )
 	hdf5? ( sci-libs/hdf5[mpi=] )
 	lapack? ( virtual/lapack )
-	metis? ( >=sci-libs/parmetis-4 )
+	metis? (
+		>=sci-libs/metis-5
+		mpi? ( >=sci-libs/parmetis-4 )
+	)
 	mpi? ( virtual/mpi )
 	muparser? ( dev-cpp/muParser )
 	opencascade? ( ~sci-libs/opencascade-${CAS_VERSION}:= )

diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 33ebb4b5232..fe9accb88f8 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -59,7 +59,10 @@ RDEPEND="dev-libs/boost
 	gsl? ( sci-libs/gsl:= )
 	hdf5? ( sci-libs/hdf5[mpi=] )
 	lapack? ( virtual/lapack )
-	metis? ( >=sci-libs/parmetis-4 )
+	metis? (
+		>=sci-libs/metis-5
+		mpi? ( >=sci-libs/parmetis-4 )
+	)
 	mpi? ( virtual/mpi )
 	muparser? ( dev-cpp/muParser )
 	opencascade? ( ~sci-libs/opencascade-${CAS_VERSION}:= )

diff --git a/sci-libs/mumps/mumps-5.3.5.ebuild b/sci-libs/mumps/mumps-5.3.5.ebuild
index 23e0f15d16a..76f2dbe8d4d 100644
--- a/sci-libs/mumps/mumps-5.3.5.ebuild
+++ b/sci-libs/mumps/mumps-5.3.5.ebuild
@@ -21,8 +21,8 @@ BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	virtual/blas
 	metis? (
-		   || ( >=sci-libs/metis-5 >=sci-libs/parmetis-4 )
-		   mpi? ( >=sci-libs/parmetis-4 )
+		>=sci-libs/metis-5
+		mpi? ( >=sci-libs/parmetis-4 )
 	)
 	mpi? ( sci-libs/scalapack )
 	scotch? ( >=sci-libs/scotch-6.0.1:=[mpi=] )

diff --git a/sci-libs/taucs/taucs-2.2-r1.ebuild b/sci-libs/taucs/taucs-2.2-r1.ebuild
index 7b91afeeed6..5d5cecde57a 100644
--- a/sci-libs/taucs/taucs-2.2-r1.ebuild
+++ b/sci-libs/taucs/taucs-2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,12 +16,9 @@ IUSE="doc"
 RESTRICT="test"
 
 RDEPEND="
+	sci-libs/metis
 	virtual/blas
-	virtual/lapack
-	|| (
-		sci-libs/metis
-		sci-libs/parmetis
-	)"
+	virtual/lapack"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 

diff --git a/sci-libs/trilinos/trilinos-13.0.1.ebuild b/sci-libs/trilinos/trilinos-13.0.1.ebuild
index 511aa77ec42..462a25dc6ef 100644
--- a/sci-libs/trilinos/trilinos-13.0.1.ebuild
+++ b/sci-libs/trilinos/trilinos-13.0.1.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
 	hwloc? ( sys-apps/hwloc )
 	matio? ( sci-libs/matio )
 	mkl? ( sci-libs/mkl )
-	metis? ( || ( sci-libs/parmetis sci-libs/metis ) )
+	metis? ( sci-libs/metis )
 	mumps? ( sci-libs/mumps )
 	netcdf? ( sci-libs/netcdf )
 	petsc? ( sci-mathematics/petsc )