gentoo resync : 14.12.2020

4 files changed, 28 insertions, 61 deletions

diff --git a/sci-libs/taucs/Manifest b/sci-libs/taucs/Manifest
index 8f3e0a392228..f72dcd1cdcc3 100644
--- a/sci-libs/taucs/Manifest
+++ b/sci-libs/taucs/Manifest
@@ -1,5 +1,4 @@
-AUX taucs-2.2-no-test-cilk.patch 743 BLAKE2B f82a9949f18419aa9a763f5a388fe032fce636e685fab8e8b5b01ad44b594012f96d2b67ce597483303202125a3415ea95cce21de892e1347a7fb932fa71f563 SHA512 77a8d0a2a44267fc29319e80739042e0b0a9a289bbc50c5f429846fe0478890d32ac9a32444cc9f93a11ce6a7560297519d254b3b68d7cc993dce517dc3e4934
 AUX taucs-2.2-respect-ar.patch 635 BLAKE2B 59ea54427651adc597caf85bf5eafe8055a6223e3c588939519e660661ffec4082d574c08aebff8106508f4b5afe147d1f7ef5c1972b17461d286273c9cbb76a SHA512 b18551f3d386ebd203b422c9848bfb14c7d8bb67e0facb450869d0846ca23e35902339cfa519ef7b33d1cf0dfb6301bad5b9f2fcd2035d1e02b150a0c15a26e3
 DIST taucs-2.2.tgz 1573863 BLAKE2B 21cf7479d7ce1f27678431e0d3dcaea1b3f8b11071b44651207791d6980bf5be0ed51cab7915f9e8da88d5da777c0f03a8d058e2ac8881e0d0b244ddfd796f5c SHA512 d8652de2da343dfd19c4278ac99313bcb577d976decdd3bd3875f0c9576832605b787feaef916eb4e82f22907c8bd029125c2ae56c827639e4d535ad62f20fcf
-EBUILD taucs-2.2.ebuild 2327 BLAKE2B 1a137803d8962e039d8a98ea0c22fdf205bc845d3736c9b9e2df6682d7eff4aee4428ccc8c1dc5c8cfa15fd4531c35a5cb265086037e4ee1bbe9938fa46c83be SHA512 1e7a63dcaf124d17f1aae3f142699bbb89fbf26cebf5a3d74edebf72b033c7a98f15880c2945e3d886aecb982f7d56eabdcb8f6a445605027719321962c8b6c0
-MISC metadata.xml 1175 BLAKE2B fff1412619a6f94befc58004019c6c92cc142f0b286f59fc07d20b25868c90fae9cd67158b87c0cae78bee4b1b1320589339cbb259a036bac4419a9ec8e601f5 SHA512 8f768378475ce4364a51fbef44315a2c34cedf4db9aae4cbbebc5e487eb193693320ae56e3464b7a14f38adec41ef5e06d940890a5b55c1ef541acaf95b4e693
+EBUILD taucs-2.2-r1.ebuild 1997 BLAKE2B 4d07ae35b27129cf2c6a17910111d52b5b33e370bcc18087b95f25af494ee0d6943b201767d0d508d57039da8acdaf3874e3ea97804342ebc63306db917ac5fe SHA512 315061fe8bad3c7119fd0ed59bb54f9d223315f5caab6638743a2c81bc9e2595914ab7fc349bf6feec4d0247b9de58c68d632e6f4ce6e1de121c9b7a44aa271e
+MISC metadata.xml 1069 BLAKE2B 783b081a16b2dd176345b558851e2c75b18b0168b058dee68140dfcdd453e821da618d11f27526af9d0f366d5107b881d4fc0011d0942de57de6a34dbbcd59f1 SHA512 c5437d4746e208ca8e43f36460b6db73c6c25193b01b3f08d112f4b0fe6b48f53fb8cede5a53e432817243665d7a8e32c00cc19ea8dd0cd9e16dadc5f7a5ee23
diff --git a/sci-libs/taucs/files/taucs-2.2-no-test-cilk.patch b/sci-libs/taucs/files/taucs-2.2-no-test-cilk.patch
deleted file mode 100644
index 332d1138dea0..000000000000
--- a/sci-libs/taucs/files/taucs-2.2-no-test-cilk.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/testscript
-+++ b/testscript
-@@ -12,17 +12,6 @@
- ulimit -s >> testscript.log
- echo '==============' >> testscript.log
- echo =============== >> testscript.log
--echo = test_cilk_snmf = >> testscript.log
--. ./configure in=progs/test_cilk_snmf.c $*
--echo last conf is $TAUCS_LASTCONF >> testscript.log
--make -f build/${TAUCS_LASTCONF}/makefile
--if bin/${TAUCS_LASTCONF}/test_cilk_snmf >> testscript.log ; then
--echo = TEST PASSED test_cilk_snmf >> testscript.log
--else
--echo = TEST FAILED test_cilk_snmf >> testscript.log
--fi
--echo =============== >> testscript.log
--echo =============== >> testscript.log
- echo = test_complex = >> testscript.log
- . ./configure in=progs/test_complex.c $*
- echo last conf is $TAUCS_LASTCONF >> testscript.log
diff --git a/sci-libs/taucs/metadata.xml b/sci-libs/taucs/metadata.xml
index b1b1d0e9c3fd..507e3718bcb6 100644
--- a/sci-libs/taucs/metadata.xml
+++ b/sci-libs/taucs/metadata.xml
@@ -1,32 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  TAUCS is a C library of sparse linear solvers.
-  The current version of the library (1.0) includes the following
-  functionality:
-
-  * Multifrontal Supernodal Cholesky Factorization.
-  * Left-Looking Supernodal Cholesky Factorization.
-  * Drop-Tolerance Incomplete-Cholesky Factorization.
-  * Out-of-Core, Left-Looking Supernodal Sparse Cholesky Factorization.
-  * Out-of-Core Sparse LU with Partial Pivoting Factor and Solve.
-  * Ordering Codes and Interfaces to Existing Ordering Codes.
-  * Multilevel-Support-Graph Preconditioners.
-  * Matrix Operations.
-  * Matrix Input/Output.
-  * Matrix Generators.
-  * Iterative Solvers.
-  * Vaidya's Preconditioners.
-  * Recursive Vaidya's Preconditioners.
-  * Multilevel-Support-Graph Preconditioners.
-  * Utility Routines
-</longdescription>
-  <use>
-    <flag name="cilk">Enable multithreading using <pkg>dev-lang/cilk</pkg></flag>
-  </use>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		TAUCS is a C library of sparse linear solvers.
+		The current version of the library (1.0) includes the following
+		functionality:
+		* Multifrontal Supernodal Cholesky Factorization.
+		* Left-Looking Supernodal Cholesky Factorization.
+		* Drop-Tolerance Incomplete-Cholesky Factorization.
+		* Out-of-Core, Left-Looking Supernodal Sparse Cholesky Factorization.
+		* Out-of-Core Sparse LU with Partial Pivoting Factor and Solve.
+		* Ordering Codes and Interfaces to Existing Ordering Codes.
+		* Multilevel-Support-Graph Preconditioners.
+		* Matrix Operations.
+		* Matrix Input/Output.
+		* Matrix Generators.
+		* Iterative Solvers.
+		* Vaidya's Preconditioners.
+		* Recursive Vaidya's Preconditioners.
+		* Multilevel-Support-Graph Preconditioners.
+		* Utility Routines
+	</longdescription>
 </pkgmetadata>
diff --git a/sci-libs/taucs/taucs-2.2.ebuild b/sci-libs/taucs/taucs-2.2-r1.ebuild
index 8ff8000be8dd..7b91afeeed64 100644
--- a/sci-libs/taucs/taucs-2.2.ebuild
+++ b/sci-libs/taucs/taucs-2.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.tau.ac.il/~stoledo/${PN}/${PV}/${PN}.tgz -> ${P}.tgz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cilk doc"
+IUSE="doc"
 RESTRICT="test"
 
 RDEPEND="
@@ -21,16 +21,13 @@ RDEPEND="
 	|| (
 		sci-libs/metis
 		sci-libs/parmetis
-	)
-	cilk? ( dev-lang/cilk )"
+	)"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"
 
 PATCHES=(
-	# test with cilk has memory leaks
-	"${FILESDIR}"/${P}-no-test-cilk.patch
 	# bug 725588
 	"${FILESDIR}"/${P}-respect-ar.patch
 )
@@ -52,11 +49,6 @@ src_configure() {
 
 	echo "LIBMETIS=$($(tc-getPKG_CONFIG) --libs metis)" >> config/linux_shared.mk || die
 	# no cat <<EOF because -o has a trailing space
-	if use cilk; then
-		echo "CILKC=cilkc" >> config/linux_shared.mk || die
-		echo "CILKFLAGS=-O2 -I${EPREFIX}/usr/include/cilk -fPIC" >> config/linux_shared.mk || die
-		echo "CILKOUTFLG=-o " >> config/linux_shared.mk || die
-	fi
 	sed -e 's/ -fPIC//g' config/linux_shared.mk || die
 }