gentoo resync : 17.02.2021

4 files changed, 1 insertions, 90 deletions

diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index 64fb02573af4..04af77d253da 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -1,8 +1,5 @@
-AUX cholmod-1.7.4-parmetis32.patch 702 BLAKE2B 241d68fa25ac2ab3f9a425702559736fb15657eda82c5ba0a413174c146c09e0be167746f866a64189d027892d180445adcf92f55fc913c9bff0085f87051c94 SHA512 a1694a7f42f10c7619e23817e93f76df35bc208200918b74a6dd68bb4662d57ce2f3665be424ad4b5c8a4ea9c3957676c48716aa0e47d9fb19337dc43e759ecc
-DIST cholmod-2.1.2.tar.bz2 656458 BLAKE2B 83a574ad7d3755428d8d732f3f60b07908b8315d73d5a3d3aaf9aac50b54590c532389dd90efc569e67639993095706eb546e72313b735e35af34a1fea398be2 SHA512 7aca97de4c60ff2d7a76a776be4c2d61243a159a51b9e147fa2480f2aaf61a5d966eb0f1cb57c0145510437f6c478fa30384b741709d0a02432b74ada3e78089
 DIST cholmod-3.0.13.tar.bz2 696002 BLAKE2B 40a065fe1a3585897b3ca554a25fa80ffc68ac70798f2f803e34a231ec4f532d113a3d00ab7ab61f5eb02503a84e1459cdb7e96cb0b0d1dc6975ed3d533104fe SHA512 c6c80d099386bac27e385a1b8ee8941cd2fb4f2dcfcf302b4b17d6477ac9ee17ad8030aae9191f92576dfaeb521e2c98ec24e867281c2405e42f95580e14f0ab
 DIST cholmod-3.0.14.tar.bz2 696981 BLAKE2B 855927c18833235b3f0835bfba455d83957b9161c0ee885c2d31d126f0f473067f55bcf2cfa163c72efb5de573589ffa54b484a8cf89bc44c9dbf64d43fda5d9 SHA512 f8c12fc3c8787be38bca6c6f84a8279c1380fbe4fabbfba754235fdb042d7050bfb7b5a21ea87ef59dbd5184d28e8cb7667966c38f5dcad78fe8d47111896a3c
-EBUILD cholmod-2.1.2.ebuild 1749 BLAKE2B ad72937ed0107ff533c0fc9c996c22ce299f989dc040b2162b3c119c851f6b5b23e6de5cef58f4c91ea2cfcfc790ab1c3c3477d0b4854ba40519a69c95cdf4f1 SHA512 eddb839768b745f9deff81454a8f6eade1d25ad2d891f498b8f3c4cca88614e72ac0df6535946929ce96b74f2ff52bca51fdd0b6d90f2e480cdac49d95340f10
 EBUILD cholmod-3.0.13.ebuild 1660 BLAKE2B 6f53739a8ea19773b34526ece750fe0e8c2d3ffa221058b4e201bbe6180c55535c9edf902b4a8c576343e5e22cbd3cbb03dd4594a6455d438cacd81450f1f0c0 SHA512 bbd5b01ef11bddcb0d10bea1917ce1b25c6d64321ecae25c63f5070d392f71c62e687847bbae1cc41fccf36db3295dffdf284f47d17de8979f550830037bebd8
 EBUILD cholmod-3.0.14.ebuild 1638 BLAKE2B 968001fa093308f7eb371f2fb950df835b15993f6bffbe5e16c84f2dd10aa6580c718a7135f1fef79222a738c4f7adf693a29aa066742492fdcaa07c54e74241 SHA512 9e65c66adece13aebef04a6ba4c746f149e0c61c5c20ce2875a3b58a1a7321eb6b3078416fb138325e61a115901bfa9ba5ad32e05e9cf3702ee7ecd49e2758da
-MISC metadata.xml 920 BLAKE2B d78c2990bf35b95155adefe8a7b6d3213cd7187d031abbe91f1e12cb2ab438fce1ec34743a21a20b649255c691b87b6033f8bf8eec30b670456c105ad80f2c9a SHA512 64083142e54e0d9df8fb93c8a9ef810c4a6c85546ed8d96413acbadcbe3120d528e15895786e303094874448eeb4b411ce457147f452f781c6184aea985f5e9a
+MISC metadata.xml 807 BLAKE2B e5a0fd3e5c5466397e9972ece2046b051f3b8fba8141e9e3a91b8ea474007b8a38998c16b3462e362d3713748620e41d2e35196d53d815c0865df7a494b3c104 SHA512 84f642bfb6676da3f9c66dddd635661c259e6182bf12c567655961c902189183570889630988f582c6913ddfa621944f0db4c22c7e9b8a715d1da8fb2fdd64f4
diff --git a/sci-libs/cholmod/cholmod-2.1.2.ebuild b/sci-libs/cholmod/cholmod-2.1.2.ebuild
deleted file mode 100644
index 4bc6ca5590c7..000000000000
--- a/sci-libs/cholmod/cholmod-2.1.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib toolchain-funcs
-
-DESCRIPTION="Sparse Cholesky factorization and update/downdate library"
-HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
-
-LICENSE="minimal? ( LGPL-2.1 ) !minimal? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc lapack metis minimal static-libs"
-
-RDEPEND="
-	>=sci-libs/amd-2.3
-	>=sci-libs/colamd-2.8
-	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
-	lapack? ( virtual/lapack )
-	metis? (
-		>=sci-libs/camd-2.3
-		>=sci-libs/ccolamd-2.8
-		|| ( <sci-libs/metis-5 <sci-libs/parmetis-4 ) )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )"
-
-src_prepare() {
-	# bug #399483 does not build with parmetis-3.2
-	has_version "=sci-libs/parmetis-3.2*" && \
-		epatch "${FILESDIR}"/${PN}-1.7.4-parmetis32.patch
-}
-
-src_configure() {
-	local lapack_libs=no
-	local blas_libs=no
-	if use lapack; then
-		blas_libs=$($(tc-getPKG_CONFIG) --libs blas)
-		lapack_libs=$($(tc-getPKG_CONFIG) --libs lapack)
-	fi
-	local myeconfargs=(
-		--with-blas="${blas_libs}"
-		--with-lapack="${lapack_libs}"
-		$(use_with doc)
-		$(use_with !minimal modify)
-		$(use_with !minimal matrixops)
-		$(use_with !minimal partition)
-		$(use_with metis camd)
-		$(use_with metis partition)
-		$(use_with lapack supernodal)
-	)
-	if use cuda; then
-		myeconfargs+=(
-			--with-cuda
-			--with-cublas-libs="-L${EPREFIX}/opt/cuda/$(get_libdir) -lcublas"
-			--with-cublas-cflags="-I${EPREFIX}/opt/cuda/include"
-		)
-	fi
-	autotools-utils_src_configure
-}
diff --git a/sci-libs/cholmod/files/cholmod-1.7.4-parmetis32.patch b/sci-libs/cholmod/files/cholmod-1.7.4-parmetis32.patch
deleted file mode 100644
index 6b50ae8bcea7..000000000000
--- a/sci-libs/cholmod/files/cholmod-1.7.4-parmetis32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nur CHOLMOD.orig/Partition/cholmod_metis.c CHOLMOD/Partition/cholmod_metis.c
---- CHOLMOD.orig/Partition/cholmod_metis.c	2012-03-13 03:57:37.000000000 +0000
-+++ CHOLMOD/Partition/cholmod_metis.c	2012-03-13 04:02:22.000000000 +0000
-@@ -216,6 +216,7 @@
-     int Opt [8], nn, csp ;
-     size_t n1 ;
-     DEBUG (Int nsep) ;
-+    float ubfactor = 1.05;
- 
-     /* ---------------------------------------------------------------------- */
-     /* check inputs */
-@@ -370,7 +371,7 @@
- #endif
- 
-     nn = n ;
--    METIS_NodeComputeSeparator (&nn, Mp, Mi, Mnw, Mew, Opt, &csp, Mpart) ;
-+    METIS_NodeComputeSeparator (&nn, Mp, Mi, Mnw, Mew, &ubfactor, Opt, &csp, Mpart) ;
-     n = nn ;
-     csep = csp ;
- 
diff --git a/sci-libs/cholmod/metadata.xml b/sci-libs/cholmod/metadata.xml
index 8bb99b368235..655cf27be61d 100644
--- a/sci-libs/cholmod/metadata.xml
+++ b/sci-libs/cholmod/metadata.xml
@@ -11,9 +11,6 @@
       Support basic sparse and dense matrix operations (add, multiply,
       scale, et cetera)
     </flag>
-    <flag name="metis">
-      Enable the Partition module to cholmod using <pkg>sci-libs/metis</pkg>
-    </flag>
     <flag name="modify">
       Enable Cholesky-modification routines like update, downdate,
       row-add, and row-delete