*/*: 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@gentoo.org>

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 a2dc0b63a54f..6d21a365986a 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 a146edfb85a0..111b80f90346 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 7449be2ae9f2..d3e93719609a 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 468137f5fed7..fa6f92f0b59e 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 faa68c5b29d2..65d0d5b7a333 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 0bdf1f25fbbb..3b4964437572 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 33ebb4b52320..fe9accb88f89 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 23e0f15d16a2..76f2dbe8d4d0 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 7b91afeeed64..5d5cecde57a0 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 511aa77ec426..462a25dc6efd 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 )